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

QmlDesigner: Ugly hack for the Window bug

Browse Source 
Window is not working so we exchange it with an item. We need a better
approach for it in the next release. Revert this patch in master.

Hotfix: 3.1

Task-number: QTCREATORBUG-11601
Change-Id: I047dd558f8813cc8b3b6c8bad3394c3cf30c8d8e
Signed-off-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2014-03-11 19:36:36 +01:00
parent 388dc9947a
commit 065253a259
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+3
View File
@@ -1053,6 +1053,9 @@ QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorN
QObject *object = 0;
QQmlType *type = getQmlType(typeName, majorNumber, minorNumber);
if (typeName == "QtQuick.Window/Window")
type = getQmlType("QtQuick/Item", 2, 0);
if (type) {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)) // TODO remove hack later if we only support >= 5.2
if ( type->isComposite()) {