aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@digia.com>2013-10-09 12:44:13 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-15 10:34:25 +0200
commitdfa234a60a112903995944573a7d2cf400af7f24 (patch)
treedb40fb356403995d6d4fa415eefabc7f58ea4424 /src/qml
parent270125b61404a8e7b0571e4e966f05995bb90800 (diff)
Fix MSVC2010 warnings.
Change-Id: Id7a2465db4f9b1cd4d3b7ecd61538ee7110893df Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/qml')
-rw-r--r--src/qml/qml/qqmlscript.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlscript.cpp b/src/qml/qml/qqmlscript.cpp
index 4c1a1f7be5..cc01307e54 100644
--- a/src/qml/qml/qqmlscript.cpp
+++ b/src/qml/qml/qqmlscript.cpp
@@ -991,7 +991,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
for(int typeIndex = 0; typeIndex < propTypeNameToTypesCount; ++typeIndex) {
const TypeNameToType *t = propTypeNameToTypes + typeIndex;
if (t->nameLength == size_t(memberType.length()) &&
- QHashedString::compare(memberType.constData(), t->name, t->nameLength)) {
+ QHashedString::compare(memberType.constData(), t->name, int(t->nameLength))) {
type = t;
break;
}
@@ -1033,7 +1033,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
Object::DynamicProperty::Type type;
if ((unsigned)memberType.length() == strlen("alias") &&
- QHashedString::compare(memberType.constData(), "alias", strlen("alias"))) {
+ QHashedString::compare(memberType.constData(), "alias", int(strlen("alias")))) {
type = Object::DynamicProperty::Alias;
typeFound = true;
}
@@ -1041,7 +1041,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
for(int ii = 0; !typeFound && ii < propTypeNameToTypesCount; ++ii) {
const TypeNameToType *t = propTypeNameToTypes + ii;
if (t->nameLength == size_t(memberType.length()) &&
- QHashedString::compare(memberType.constData(), t->name, t->nameLength)) {
+ QHashedString::compare(memberType.constData(), t->name, int(t->nameLength))) {
type = t->type;
typeFound = true;
}
@@ -1053,7 +1053,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
if (typeModifier.isEmpty()) {
type = Object::DynamicProperty::Custom;
} else if((unsigned)typeModifier.length() == strlen("list") &&
- QHashedString::compare(typeModifier.constData(), "list", strlen("list"))) {
+ QHashedString::compare(typeModifier.constData(), "list", int(strlen("list")))) {
type = Object::DynamicProperty::CustomList;
} else {
QQmlError error;