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

QmlDesigner: Fix Qt 6 imports

Browse Source 
This allows using a Qt 5 puppet with simple Qt 6 files.

Change-Id: Ic3264ffbf8d798ff260305079a0bb281f9628795
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2021-04-06 18:44:45 +02:00
parent 85e2368b38
commit c7d9ca1154
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+6
View File
@@ -689,6 +689,12 @@ QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorN
* QML type. This is the case for example if a C++ type is mocked up with a QML file.
*/
if (!object && majorNumber == 6 && minorNumber == 0) {
object = QmlPrivateGate::createPrimitive(polishTypeName, 2, 15, context);
if (!object)
object = QmlPrivateGate::createPrimitive(polishTypeName, 1, 0, context);
}
if (!object)
object = createPrimitiveFromSource(polishTypeName, majorNumber, minorNumber, context);