Date: Sun, 4 May 2014 12:20:33 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352943 - head/devel/qtcreator/files Message-ID: <201405041220.s44CKX4w060152@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sun May 4 12:20:32 2014 New Revision: 352943 URL: http://svnweb.freebsd.org/changeset/ports/352943 QAT: https://qat.redports.org/buildarchive/r352943/ Log: Add upstream patch that fixes the build on -CURRENT. 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 Added: head/devel/qtcreator/files/ head/devel/qtcreator/files/patch-src__shared__qbs__src__lib__parser__qmljs.g (contents, props changed) head/devel/qtcreator/files/patch-src__shared__qbs__src__lib__parser__qmljsparser_p.h (contents, props changed) Added: head/devel/qtcreator/files/patch-src__shared__qbs__src__lib__parser__qmljs.g ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qtcreator/files/patch-src__shared__qbs__src__lib__parser__qmljs.g Sun May 4 12:20:32 2014 (r352943) @@ -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; + } + Added: head/devel/qtcreator/files/patch-src__shared__qbs__src__lib__parser__qmljsparser_p.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qtcreator/files/patch-src__shared__qbs__src__lib__parser__qmljsparser_p.h Sun May 4 12:20:32 2014 (r352943) @@ -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; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405041220.s44CKX4w060152>