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

QmlDesigner: Allow creation without version number

Browse Source 
Task-number: QDS-4403
Change-Id: I952de9a2a6aa345b041f890fb2d364850c25e492
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Thomas Hartmann
2021-05-31 16:06:30 +02:00
parent a19ff0550b
commit 8910601b78
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
View File

@@ -684,6 +684,8 @@ QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorN
object = QmlPrivateGate::createComponent(mockHash.value(typeName), context); object = QmlPrivateGate::createComponent(mockHash.value(typeName), context);
else if (majorNumber != -1 && minorNumber != -1) else if (majorNumber != -1 && minorNumber != -1)
object = QmlPrivateGate::createPrimitive(polishTypeName, majorNumber, minorNumber, context); object = QmlPrivateGate::createPrimitive(polishTypeName, majorNumber, minorNumber, context);
else
object = QmlPrivateGate::createPrimitive(polishTypeName, 0, 0, context);
/* Let's try to create the primitive from source, since with incomplete meta info this might be a pure /* Let's try to create the primitive from source, since with incomplete meta info this might be a pure
* QML type. This is the case for example if a C++ type is mocked up with a QML file. * QML type. This is the case for example if a C++ type is mocked up with a QML file.

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

@@ -175,7 +175,11 @@ void registerNodeInstanceMetaObject(QObject *object, QQmlEngine *engine)
QObject *createPrimitive(const QString &typeName, int majorNumber, int minorNumber, QQmlContext *context) QObject *createPrimitive(const QString &typeName, int majorNumber, int minorNumber, QQmlContext *context)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
return QQuickDesignerSupportItems::createPrimitive(typeName, QTypeRevision::fromVersion(majorNumber, minorNumber), context);
QTypeRevision revision = QTypeRevision::zero();
if (majorNumber > 0)
revision = QTypeRevision::fromVersion(majorNumber, minorNumber);
return QQuickDesignerSupportItems::createPrimitive(typeName, revision, context);
#else #else
return QQuickDesignerSupportItems::createPrimitive(typeName, majorNumber, minorNumber, context); return QQuickDesignerSupportItems::createPrimitive(typeName, majorNumber, minorNumber, context);
#endif #endif