From 0b91475b6d2a7752763a5c5146ef80905cb6a40a Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 29 May 2013 15:23:44 +0200 Subject: [PATCH] QmlDesigner.Instances: fix for Mac OS and Qt 4 The QSharedMemory implementations of Qt5 and Qt4 on Mac seem to be incompatible. We seem to have the same bug casually for Linux. Until we solve the real issue this serves as a quick fix. Change-Id: I686e3e94b6bb777b96f8c68cac6036c18b8d070d Reviewed-by: Marco Bubke --- .../designercore/instances/nodeinstanceserverproxy.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index c5fb89d1e80..5ddff4a7ed5 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -158,6 +158,10 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV QProcessEnvironment enviroment = QProcessEnvironment::systemEnvironment(); +#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) && (defined(Q_OS_MAC) || defined(Q_OS_LINUX)) + enviroment.insert(QLatin1String("DESIGNER_DONT_USE_SHARED_MEMORY"), QLatin1String("1")); +#endif + if (QFileInfo(applicationPath).exists()) { m_qmlPuppetEditorProcess = new QProcess; m_qmlPuppetEditorProcess->setProcessEnvironment(enviroment);