From 3c30575030123e8f7be52a6d85bff849e90380ab Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 6 Jan 2016 21:28:03 +0200 Subject: [PATCH] fix yet another instance of QmlJsParser upstream commits: https://github.com/qtproject/qtquick1/commit/b1da4fb04457d0fe144478dea4364f326a0961a3 Signed-off-by: Ivailo Monev --- src/declarative/qml/parser/qdeclarativejs.g | 2 +- src/declarative/qml/parser/qdeclarativejsparser_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g index 3143f6625..57388a095 100644 --- a/src/declarative/qml/parser/qdeclarativejs.g +++ b/src/declarative/qml/parser/qdeclarativejs.g @@ -307,7 +307,7 @@ public: inline DiagnosticMessage diagnosticMessage() const { foreach (const DiagnosticMessage &d, diagnostic_messages) { - if (! d.kind == DiagnosticMessage::Warning) + if (d.kind != DiagnosticMessage::Warning) return d; } diff --git a/src/declarative/qml/parser/qdeclarativejsparser_p.h b/src/declarative/qml/parser/qdeclarativejsparser_p.h index 4d4192549..1ac60bb0b 100644 --- a/src/declarative/qml/parser/qdeclarativejsparser_p.h +++ b/src/declarative/qml/parser/qdeclarativejsparser_p.h @@ -171,7 +171,7 @@ public: inline DiagnosticMessage diagnosticMessage() const { foreach (const DiagnosticMessage &d, diagnostic_messages) { - if (! d.kind == DiagnosticMessage::Warning) + if (d.kind != DiagnosticMessage::Warning) return d; } -- 2.11.0