diff options
-rw-r--r-- | src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp | 5 | ||||
-rw-r--r-- | src/plugins/qmldesigner/designercore/instances/puppetcreator.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 48249a07ba..fa98d5c97b 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -132,7 +132,10 @@ QProcess *PuppetCreator::createPuppetProcess(PuppetCreator::QmlPuppetVersion pup else puppetPath = qml2PuppetPath(m_availablePuppetType); + const QString workingDirectory = qmlPuppetDirectory(m_availablePuppetType); + return puppetProcess(puppetPath, + workingDirectory, puppetMode, socketToken, handlerObject, @@ -142,6 +145,7 @@ QProcess *PuppetCreator::createPuppetProcess(PuppetCreator::QmlPuppetVersion pup QProcess *PuppetCreator::puppetProcess(const QString &puppetPath, + const QString &workingDirectory, const QString &puppetMode, const QString &socketToken, QObject *handlerObject, @@ -158,6 +162,7 @@ QProcess *PuppetCreator::puppetProcess(const QString &puppetPath, puppetProcess->setProcessChannelMode(QProcess::MergedChannels); QObject::connect(puppetProcess, SIGNAL(readyRead()), handlerObject, outputSlot); } + puppetProcess->setWorkingDirectory(workingDirectory); puppetProcess->start(puppetPath, QStringList() << socketToken << puppetMode << "-graphicssystem raster"); if (!qgetenv("DEBUG_QML_PUPPET").isEmpty()) diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.h b/src/plugins/qmldesigner/designercore/instances/puppetcreator.h index 31bc499c43..4c9b8c337b 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.h +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.h @@ -94,6 +94,7 @@ protected: bool qtIsSupported() const; static bool checkPuppetVersion(const QString &qmlPuppetPath); QProcess *puppetProcess(const QString &puppetPath, + const QString &workingDirectory, const QString &puppetMode, const QString &socketToken, QObject *handlerObject, |