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

qmlpuppet: adjust to api changes in Qt 6.2

Browse Source 
Change-Id: I3c9139cacb7ff9eb7b8138e0a7f589280a24c13a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2021-07-07 13:04:37 +02:00
parent 4c878e5700
commit 22a87fdd95
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h
View File

@@ -71,9 +71,7 @@ public:
PropertyNameList propertyNameListForWritableProperties(QObject *object, PropertyNameList propertyNameListForWritableProperties(QObject *object,
const PropertyName &baseName = PropertyName(), const PropertyName &baseName = PropertyName(),
QObjectList *inspectedObjects = nullptr); QObjectList *inspectedObjects = nullptr);
PropertyNameList allPropertyNames(QObject *object, PropertyNameList allPropertyNames(QObject *object);
const PropertyName &baseName = PropertyName(),
QObjectList *inspectedObjects = nullptr);
bool hasFullImplementedListInterface(const QQmlListReference &list); bool hasFullImplementedListInterface(const QQmlListReference &list);
void registerCustomData(QObject *object); void registerCustomData(QObject *object);

20
share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
View File

@@ -68,8 +68,8 @@ static void addToPropertyNameListIfNotBlackListed(
} }
PropertyNameList allPropertyNamesInline(QObject *object, PropertyNameList allPropertyNamesInline(QObject *object,
const PropertyName &baseName, const PropertyName &baseName = {},
QObjectList *inspectedObjects, QObjectList *inspectedObjects = nullptr,
int depth = 0) int depth = 0)
{ {
QQuickDesignerSupport::PropertyNameList propertyNameList; QQuickDesignerSupport::PropertyNameList propertyNameList;
@@ -136,24 +136,20 @@ PropertyNameList allPropertyNamesInline(QObject *object,
} }
#endif #endif
PropertyNameList allPropertyNames(QObject *object, PropertyNameList allPropertyNames(QObject *object)
const PropertyName &baseName,
QObjectList *inspectedObjects)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
return QQuickDesignerSupportProperties::allPropertyNames(object, baseName, inspectedObjects); return QQuickDesignerSupportProperties::allPropertyNames(object);
#elif QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) #elif QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
return allPropertyNamesInline(object, baseName, inspectedObjects); return allPropertyNamesInline(object);
#else #else
return QQuickDesignerSupportProperties::allPropertyNames(object, baseName, inspectedObjects); return QQuickDesignerSupportProperties::allPropertyNames(object);
#endif #endif
} }
PropertyNameList propertyNameListForWritableProperties(QObject *object, PropertyNameList propertyNameListForWritableProperties(QObject *object)
const PropertyName &baseName,
QObjectList *inspectedObjects)
{ {
return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object, baseName, inspectedObjects); return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object);
} }
void tweakObjects(QObject *object) void tweakObjects(QObject *object)