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

QmlDesigner.qmlPuppet: allows specifying alternative to qmlpuppet

Browse Source 
This allows the user to specify another qmlpuppet then the one
delivered with QtCreator. For example a pupper build with mingw.

The enviroment variable QTCREATOR_QMLPUPPET_PATH is used.

Reviewed-by: Kai Koehne
This commit is contained in:
Thomas Hartmann
2011-03-08 16:52:12 +01:00
parent bc0303e143
commit 386e204685
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
View File

@@ -95,6 +95,11 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
#endif #endif
applicationPath += "/qmlpuppet"; applicationPath += "/qmlpuppet";
QByteArray envImportPath = qgetenv("QTCREATOR_QMLPUPPET_PATH");
if (!envImportPath.isEmpty()) {
applicationPath = envImportPath;
}
m_qmlPuppetEditorProcess = new QProcess; m_qmlPuppetEditorProcess = new QProcess;
connect(m_qmlPuppetEditorProcess.data(), SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(processFinished(int,QProcess::ExitStatus))); connect(m_qmlPuppetEditorProcess.data(), SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(processFinished(int,QProcess::ExitStatus)));
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), m_qmlPuppetEditorProcess.data(), SLOT(kill())); connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), m_qmlPuppetEditorProcess.data(), SLOT(kill()));