diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2014-07-24 19:38:51 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2014-07-30 13:44:01 +0200 |
| commit | 5778a393173823118339083a4fd4f2ed11fd85a8 (patch) | |
| tree | 99721d8c2d6911bf65e4bf116c7b5f69cc6aab58 /share | |
| parent | 67a5cc39d1a812eebfaca58edea293df32d1cf95 (diff) | |
QmlDesigner: read window mock from file
Change-Id: Ic525b1d3ac18c42c6abb6a93195e220465dd017f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'share')
3 files changed, 12 insertions, 12 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml new file mode 100644 index 0000000000..e04c067cf8 --- /dev/null +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml @@ -0,0 +1,5 @@ +import QtQuick 2.2 + +Rectangle { + property string title +} diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index 589c47883f..bc1e5c7bd3 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -1089,17 +1089,9 @@ static bool isCrashingType(QQmlType *type) return false; } -static QObject *createDummyWindow(QQmlContext *context, const QUrl &sourceUrl) +static QObject *createDummyWindow(QQmlContext *context) { - QQmlComponent component(context->engine()); - QByteArray dummyWindow; - dummyWindow.append("import QtQuick 2.0\n"); - dummyWindow.append("Rectangle {\n"); - dummyWindow.append("property string title\n"); - dummyWindow.append("}\n"); - - component.setData(dummyWindow, sourceUrl); - + QQmlComponent component(context->engine(), QUrl(QStringLiteral("qrc:/qtquickplugin/mockfiles/Window.qml"))); return component.create(); } @@ -1137,10 +1129,12 @@ QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorN if (isWindow(object)) { delete object; - object = createDummyWindow(context, type->sourceUrl()); + object = createDummyWindow(context); } - } else { + } + + if (!object) { qWarning() << "QuickDesigner: Cannot create an object of type" << QString("%1 %2,%3").arg(typeName).arg(majorNumber).arg(minorNumber) << "- type isn't known to declarative meta type system"; diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc b/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc index ceb6142cb3..e9588ab045 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc @@ -3,5 +3,6 @@ <file>images/template_image.png</file> <file>html/welcome.html</file> <file>images/webkit.png</file> + <file>mockfiles/Window.qml</file> </qresource> </RCC> |