projects / platform / upstream / qtdeclarative.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a74af1f)
[new compiler] Fix logic error in enum resolver
authorSimon Hausmann <simon.hausmann@digia.com>
Wed, 5 Feb 2014 10:34:04 +0000 (11:34 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 5 Feb 2014 10:37:55 +0000 (11:37 +0100)
Change-Id: I614cc1428439801ed20cdee099cf8260ff930618
Reviewed-by: Liang Qi <liang.qi@digia.com>
src/qml/compiler/qqmltypecompiler.cpp patch | blob | history

diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp
index ea99c51bcf83918ce77d7210909c1fb4f2e69fd6..4466b430fe3e7f7d6cae4ff0030eaafafa05955f 100644 (file)
--- a/src/qml/compiler/qqmltypecompiler.cpp
+++ b/src/qml/compiler/qqmltypecompiler.cpp
@@ -851,7 +851,7 @@ bool QQmlEnumTypeResolver::resolveEnumBindings()
             if (!pd)
                 continue;
 
-            if (!pd->isEnum() && !pd->propType != QMetaType::Int)
+            if (!pd->isEnum() && pd->propType != QMetaType::Int)
                 continue;
 
             if (!tryQualifiedEnumAssignment(obj, propertyCache, pd, binding))
Domain: UI Framework / Qt;