From 00724439761961469427600631ca859d46c1aaba Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Mon, 28 Sep 2015 11:33:41 +0200
Subject: 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>
---
 src/qml/qml/qqmlvmemetaobject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/qml')

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) {
-- 
cgit v1.2.3