diff options
| author | Marco Bubke <marco.bubke@digia.com> | 2012-10-10 17:14:31 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@digia.com> | 2012-10-11 17:58:11 +0200 |
| commit | f0d4199dfa824f5f5c39ce69dd6c410df60a3939 (patch) | |
| tree | beb524fd428c7b2661d99424fa295396cf740a7b | |
| parent | 05c1e7925d8e1c008b295974047c9391b6242088 (diff) | |
QmlDesigner.NodeInstances: Fix rendering code path
Change-Id: I2a479e85d7ea6f5803d78d3e2ce86849c882c5a3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
4 files changed, 3 insertions, 2 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp index 171a2fb24f..dcbd513db6 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp @@ -63,6 +63,7 @@ void Qt5NodeInstanceServer::initializeView(const QVector<AddImportContainer> &/* Q_ASSERT(!quickView()); m_quickView = new QQuickView; + DesignerSupport::createOpenGLContext(m_quickView.data()); } QQmlView *Qt5NodeInstanceServer::declarativeView() const diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp index 53297b22ba..f45b5e2280 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp @@ -33,7 +33,7 @@ #include "statepreviewimagechangedcommand.h" #include "createscenecommand.h" #include "removesharedmemorycommand.h" - +#include <QQuickView> #include <QQuickItem> #include <designersupport.h> diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp index 80ca5b2cb4..3a8ebbc51c 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp @@ -30,6 +30,7 @@ #include "qt5rendernodeinstanceserver.h" #include <QQuickItem> +#include <QQuickView> #include "servernodeinstance.h" #include "childrenchangeeventfilter.h" diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index fba672b847..744768c88a 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -142,7 +142,6 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV } QProcessEnvironment enviroment = QProcessEnvironment::systemEnvironment(); - enviroment.insert("QML_NO_THREADED_RENDERER", "true"); if (QFileInfo(applicationPath).exists()) { m_qmlPuppetEditorProcess = new QProcess; |