summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-11-22 22:44:19 -0800
committerThiago Macieira <thiago.macieira@intel.com>2014-12-17 18:25:54 +0100
commita03c5699af133272daad5303956768893e6695bf (patch)
treee5d5967b0c2513fc052389b52a8d3a0e9c5d5a4c
parent1570e410c61e0c1b3d2c68a1b667311deaaf24a9 (diff)
Fix change-of-sign warning detected by ICC
subscribeIndex is quint16, so it can't store a value of -1. Store 65535 instead. Note: in findgeneric, subIdx will NOT be -1. It will be 65535. Change-Id: I4b5ad6415609f409660a035de6f763ddb2da2f7e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-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;