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

QmlDesigner: Do not instanciate ApplicationWindow

Browse Source 
Change-Id: I7a57de60aba72823579e986e9ad6278c4a7e84a8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2021-07-16 15:15:39 +02:00
committed by Tim Jenssen
parent 3af9590db2
commit ef8f18fb70
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -668,11 +668,10 @@ ObjectNodeInstance::Pointer ObjectNodeInstance::create(QObject *object)
QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorNumber, int minorNumber, QQmlContext *context) QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorNumber, int minorNumber, QQmlContext *context)
{ {
QString polishTypeName = typeName; QString polishTypeName = typeName;
if (typeName == "QtQuick.Controls/Popup" if (typeName == "QtQuick.Controls/Popup" || typeName == "QtQuick.Controls/Drawer"
|| typeName == "QtQuick.Controls/Drawer" || typeName == "QtQuick.Controls/Dialog" || typeName == "QtQuick.Controls/Menu"
|| typeName == "QtQuick.Controls/Dialog" || typeName == "QtQuick.Controls/ToolTip"
|| typeName == "QtQuick.Controls/Menu" || typeName == "QtQuick.Controls/ApplicationWindow")
|| typeName == "QtQuick.Controls/ToolTip")
polishTypeName = "QtQuick/Item"; polishTypeName = "QtQuick/Item";
const QHash<QString, QString> mockHash = {{"QtQuick.Controls/SwipeView","qrc:/qtquickplugin/mockfiles/SwipeView.qml"}, const QHash<QString, QString> mockHash = {{"QtQuick.Controls/SwipeView","qrc:/qtquickplugin/mockfiles/SwipeView.qml"},