feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmlpuppet: Fix build against Qt 5.6

Browse Source 
Change-Id: Ia8417541888fa6a9b282db39f906024e83fee196
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
This commit is contained in:
Friedemann Kleint
2015-08-25 10:07:34 +02:00
parent d618c05e3a
commit e603cafbe5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp
View File

@@ -76,8 +76,10 @@ struct MetaPropertyData {
static bool constructedMetaData(const QQmlVMEMetaData* data) static bool constructedMetaData(const QQmlVMEMetaData* data)
{ {
return data->varPropertyCount == 0 return data->propertyCount == 0
&& data->propertyCount == 0 #if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
&& data->varPropertyCount == 0
#endif
&& data->aliasCount == 0 && data->aliasCount == 0
&& data->signalCount == 0 && data->signalCount == 0
&& data->methodCount == 0; && data->methodCount == 0;
@@ -86,7 +88,9 @@ static bool constructedMetaData(const QQmlVMEMetaData* data)
static QQmlVMEMetaData* fakeMetaData() static QQmlVMEMetaData* fakeMetaData()
{ {
QQmlVMEMetaData* data = new QQmlVMEMetaData; QQmlVMEMetaData* data = new QQmlVMEMetaData;
#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
data->varPropertyCount = 0; data->varPropertyCount = 0;
#endif
data->propertyCount = 0; data->propertyCount = 0;
data->aliasCount = 0; data->aliasCount = 0;
data->signalCount = 0; data->signalCount = 0;