Commit de2f1312 authored by Marco Bubke's avatar Marco Bubke

QmlDesigner: For debug only the qt puppet should be used

Otherwise it is so easy to use a old puppet.

Change-Id: Ibe4cb8a783b88805db836fbb5874c349bb3976ea
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent e81152ac
......@@ -145,14 +145,17 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
} else {
applicationPath = macOSBundlePath(applicationPath);
applicationPath += QLatin1Char('/') + qmlPuppetApplicationName();
#ifdef QT_NO_DEBUG // to prevent of choosing the wrong puppet in debug
if (!QFileInfo(applicationPath).exists()) { //No qmlpuppet in Qt
//We have to find out how to give not too intrusive feedback
applicationPath = QCoreApplication::applicationDirPath();
applicationPath = macOSBundlePath(applicationPath);
applicationPath += QLatin1Char('/') + qmlPuppetApplicationName();
}
#endif
}
QByteArray envImportPath = qgetenv("QTCREATOR_QMLPUPPET_PATH");
if (!envImportPath.isEmpty())
applicationPath = envImportPath;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment