aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-09-28 11:33:41 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-10-05 09:06:17 +0000
commit00724439761961469427600631ca859d46c1aaba (patch)
treedddc9d7311868447690cc2407208cc29a5b6a1ee /src
parent1a335f6ae320dfedef617564a161b73ff276ca5b (diff)
qqmlvmemetaobject.cpp: Fix conversion warning by MSVC2015/64.
qml\qqmlvmemetaobject.cpp(620): warning C4312: 'reinterpret_cast': conversion from 'int' to 'quintptr *' of greater size Change-Id: Ic24caf32b82b06bce04f4d4917efdf303be68444 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/qml/qqmlvmemetaobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 54b5f2da0d..67c4295d95 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -617,7 +617,7 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void *
list_append, list_count, list_at,
list_clear);
p->dummy1 = this;
- p->dummy2 = reinterpret_cast<quintptr *>(methodOffset() + id);
+ p->dummy2 = reinterpret_cast<void *>(quintptr(methodOffset() + id));
} else {
QV4::MemberData *md = propertiesAsMemberData();
if (md) {