kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add upstream patch that fixes the build on -CURRENT.

Browse source 
In file included from ../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/language/itemreader.cpp:36:
../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/parser/qmljsparser_p.h:156:17: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses]
            if (! d.kind == DiagnosticMessage::Warning)
                ^        ~~
../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/parser/qmljsparser_p.h:156:17: note: add parentheses after the '!' to evaluate the comparison first
            if (! d.kind == DiagnosticMessage::Warning)
                ^
                  (                                   )
../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/parser/qmljsparser_p.h:156:17: note: add parentheses around left hand side expression to silence this warning
            if (! d.kind == DiagnosticMessage::Warning)
                ^
                (       )
1 error generated.

MFH:		2014Q2
This commit is contained in:
Raphael Kubo da Costa 2014-05-04 12:20:32 +00:00
parent ee93a49cbc
commit 176cfc8d3e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=352943
2 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
devel/qtcreator/files/patch-src__shared__qbs__src__lib__parser__qmljs.g Normal file
View file

@ -0,0 +1,20 @@
commit b196bb68f7ac03b3bf9fcbcb4af3ae81e0ca0d7e
Author: Christian Kandeler <christian.kandeler@digia.com>
Date: Fri Aug 9 11:32:05 2013 +0200
Fix typo in QmlJsParser.
Change-Id: Iade7c0ad78576e1b5bc8110bef8dfb51db7eff8a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
--- src/shared/qbs/src/lib/parser/qmljs.g
+++ src/shared/qbs/src/lib/parser/qmljs.g
@@ -291,7 +291,7 @@ public:
inline DiagnosticMessage diagnosticMessage() const
{
foreach (const DiagnosticMessage &d, diagnostic_messages) {
- if (! d.kind == DiagnosticMessage::Warning)
+ if (d.kind != DiagnosticMessage::Warning)
return d;
}

20
devel/qtcreator/files/patch-src__shared__qbs__src__lib__parser__qmljsparser_p.h Normal file
View file

@ -0,0 +1,20 @@
commit b196bb68f7ac03b3bf9fcbcb4af3ae81e0ca0d7e
Author: Christian Kandeler <christian.kandeler@digia.com>
Date: Fri Aug 9 11:32:05 2013 +0200
Fix typo in QmlJsParser.
Change-Id: Iade7c0ad78576e1b5bc8110bef8dfb51db7eff8a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
--- src/shared/qbs/src/lib/parser/qmljsparser_p.h
+++ src/shared/qbs/src/lib/parser/qmljsparser_p.h
@@ -153,7 +153,7 @@ public:
inline DiagnosticMessage diagnosticMessage() const
{
foreach (const DiagnosticMessage &d, diagnostic_messages) {
- if (! d.kind == DiagnosticMessage::Warning)
+ if (d.kind != DiagnosticMessage::Warning)
return d;
}