diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:25:15 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:25:15 +0100 |
commit | c7d154620ef22c82661f3a25a311548c5fabd019 (patch) | |
tree | 3bc788242573297b0d9e31b22d894b7996e163ab | |
parent | 037945e957508d399b34db5ca19fd5c9efa22db6 (diff) | |
parent | a03c5699af133272daad5303956768893e6695bf (diff) | |
download | qtquick1-c7d154620ef22c82661f3a25a311548c5fabd019.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I7a07ebd7ccf3fc9ec26f7bbf2936b1a787c097f7
-rw-r--r-- | src/declarative/qml/qdeclarativecompiledbindings.cpp | 4 |
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; |