summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-01-19 13:24:24 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-01-19 13:24:24 +0100
commit048a6df6ab38769dbdfd2a0b1b5947305ce95dce (patch)
treebaa761175a4ee7b2053064317da21c4120cef115
parent802ac9c0af4617246d496157448064bd85b738c3 (diff)
parentc7d154620ef22c82661f3a25a311548c5fabd019 (diff)
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
-rw-r--r--src/declarative/qml/qdeclarativecompiledbindings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index 50a7f604..67c1d023 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -2024,7 +2024,7 @@ bool QDeclarativeBindingCompilerPrivate::parseName(AST::Node *node, Result &type
if (subscription(subscribeName, &type))
find.find.subscribeIndex = subscriptionIndex(subscribeName);
else
- find.find.subscribeIndex = -1;
+ find.find.subscribeIndex = ~0;
bytecode << find;
type.unknownType = true;
@@ -2085,7 +2085,7 @@ bool QDeclarativeBindingCompilerPrivate::parseName(AST::Node *node, Result &type
if (subscription(subscribeName, &type))
prop.find.subscribeIndex = subscriptionIndex(subscribeName);
else
- prop.find.subscribeIndex = -1;
+ prop.find.subscribeIndex = ~0;
type.unknownType = true;
type.metaObject = 0;