From e603cafbe5732a2ee46fc761e94ae027ccefa79b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Tue, 25 Aug 2015 10:07:34 +0200
Subject: [PATCH] qmlpuppet: Fix build against Qt 5.6
Change-Id: Ia8417541888fa6a9b282db39f906024e83fee196
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
.../qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp
index 7f6351b1287..db0554a6b9f 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp
@@ -76,8 +76,10 @@ struct MetaPropertyData {
static bool constructedMetaData(const QQmlVMEMetaData* data)
{
- return data->varPropertyCount == 0
- && data->propertyCount == 0
+ return data->propertyCount == 0
+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
+ && data->varPropertyCount == 0
+#endif
&& data->aliasCount == 0
&& data->signalCount == 0
&& data->methodCount == 0;
@@ -86,7 +88,9 @@ static bool constructedMetaData(const QQmlVMEMetaData* data)
static QQmlVMEMetaData* fakeMetaData()
{
QQmlVMEMetaData* data = new QQmlVMEMetaData;
+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
data->varPropertyCount = 0;
+#endif
data->propertyCount = 0;
data->aliasCount = 0;
data->signalCount = 0;
--
GitLab