From 1ef9e72d649cd66d2aa2cb44f4a2d0900ca67192 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 5 Aug 2020 12:51:11 +0200 Subject: [PATCH] QmlPuppet: Make compilable with Qt6 Task-number: QTCREATORBUG-24098 Change-Id: Ia5fd2b74cf2cfdb149a3df9de9d5a47058d21c9e Reviewed-by: Thomas Hartmann --- .../qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp index d41323e310a..b1494e5b3bb 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()