diff options
| author | hjk <hjk@qt.io> | 2020-08-05 12:51:11 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-08-07 07:27:20 +0000 |
| commit | 1ef9e72d649cd66d2aa2cb44f4a2d0900ca67192 (patch) | |
| tree | b49c8d360e5f1fc894579aef6619be2df484818c /share/qtcreator/qml/qmlpuppet | |
| parent | 242af33430d6f48aa73fe7195457fc178ee0ac03 (diff) | |
QmlPuppet: Make compilable with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ia5fd2b74cf2cfdb149a3df9de9d5a47058d21c9e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp index d41323e310..b1494e5b3b 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp @@ -87,9 +87,14 @@ void registerNodeInstanceMetaObject(QObject *object, QQmlEngine *engine) QQuickDesignerSupportProperties::registerNodeInstanceMetaObject(object, engine); } +// This is used in share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp QObject *createPrimitive(const QString &typeName, int majorNumber, int minorNumber, QQmlContext *context) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + return QQuickDesignerSupportItems::createPrimitive(typeName, QTypeRevision::fromVersion(majorNumber, minorNumber), context); +#else return QQuickDesignerSupportItems::createPrimitive(typeName, majorNumber, minorNumber, context); +#endif } static QString qmlDesignerRCPath() |