Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	.qmake.conf

Change-Id: I7a07ebd7ccf3fc9ec26f7bbf2936b1a787c097f7

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;