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

readd changes at puppetcreator

Browse Source 
Change-Id: I050a02fdfc2dde9048589e52b00353c1c0c25bd4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2015-09-29 11:09:22 +02:00
parent 3a35d36b02
commit d5b8b9c951
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
View File

@@ -151,14 +151,14 @@ QProcess *PuppetCreator::puppetProcess(const QString &puppetPath,
puppetProcess->setProcessEnvironment(processEnvironment()); puppetProcess->setProcessEnvironment(processEnvironment());
QObject::connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), puppetProcess, SLOT(kill())); QObject::connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), puppetProcess, SLOT(kill()));
QObject::connect(puppetProcess, SIGNAL(finished(int,QProcess::ExitStatus)), handlerObject, finishSlot); QObject::connect(puppetProcess, SIGNAL(finished(int,QProcess::ExitStatus)), handlerObject, finishSlot);
QString forwardOutputMode = qgetenv("FORWARD_QML_PUPPET_OUTPUT").toLower(); QString forwardOutputMode = QString::fromLatin1(qgetenv("FORWARD_QML_PUPPET_OUTPUT").toLower());
bool fowardQmlpuppetOutput = forwardOutputMode == puppetMode || forwardOutputMode == "true"; bool fowardQmlpuppetOutput = forwardOutputMode == puppetMode || forwardOutputMode == QLatin1String("true");
if (fowardQmlpuppetOutput) { if (fowardQmlpuppetOutput) {
puppetProcess->setProcessChannelMode(QProcess::MergedChannels); puppetProcess->setProcessChannelMode(QProcess::MergedChannels);
QObject::connect(puppetProcess, SIGNAL(readyRead()), handlerObject, outputSlot); QObject::connect(puppetProcess, SIGNAL(readyRead()), handlerObject, outputSlot);
} }
puppetProcess->setWorkingDirectory(workingDirectory); puppetProcess->setWorkingDirectory(workingDirectory);
puppetProcess->start(puppetPath, QStringList() << socketToken << puppetMode << "-graphicssystem raster"); puppetProcess->start(puppetPath, QStringList() << socketToken << puppetMode << QLatin1String("-graphicssystem raster"));
if (!qgetenv("DEBUG_QML_PUPPET").isEmpty()) if (!qgetenv("DEBUG_QML_PUPPET").isEmpty())
QMessageBox::information(Core::ICore::dialogParent(), QMessageBox::information(Core::ICore::dialogParent(),
@@ -250,9 +250,10 @@ void PuppetCreator::createQml2PuppetExecutableIfMissing()
m_availablePuppetType = FallbackPuppet; m_availablePuppetType = FallbackPuppet;
if (!useOnlyFallbackPuppet()) { if (!useOnlyFallbackPuppet()) {
if (m_qml2PuppetForKitPuppetHash.contains(m_kit->id())) { // check if there was an already failing try to get the UserSpacePuppet
m_availablePuppetType = m_qml2PuppetForKitPuppetHash.value(m_kit->id()); // -> imagine as result a FallbackPuppet and nothing will happen again
} else if (checkQml2PuppetIsReady()) { if (m_qml2PuppetForKitPuppetHash.value(m_kit->id(), UserSpacePuppet) == UserSpacePuppet ) {
if (checkQml2PuppetIsReady()) {
m_availablePuppetType = UserSpacePuppet; m_availablePuppetType = UserSpacePuppet;
} else { } else {
if (m_kit->isValid()) { if (m_kit->isValid()) {
@@ -266,6 +267,7 @@ void PuppetCreator::createQml2PuppetExecutableIfMissing()
} }
} }
} }
}
QString PuppetCreator::defaultPuppetToplevelBuildDirectory() QString PuppetCreator::defaultPuppetToplevelBuildDirectory()
{ {
@@ -319,9 +321,9 @@ QProcessEnvironment PuppetCreator::processEnvironment() const
Utils::Environment environment = Utils::Environment::systemEnvironment(); Utils::Environment environment = Utils::Environment::systemEnvironment();
if (!useOnlyFallbackPuppet()) if (!useOnlyFallbackPuppet())
m_kit->addToEnvironment(environment); m_kit->addToEnvironment(environment);
environment.set("QML_BAD_GUI_RENDER_LOOP", "true"); environment.set(QLatin1String("QML_BAD_GUI_RENDER_LOOP"), QLatin1String("true"));
environment.set("QML_USE_MOCKUPS", "true"); environment.set(QLatin1String("QML_USE_MOCKUPS"), QLatin1String("true"));
environment.set("QML_PUPPET_MODE", "true"); environment.set(QLatin1String("QML_PUPPET_MODE"), QLatin1String("true"));
const QString controlsStyle = QmlDesignerPlugin::instance()->settings().controlsStyle; const QString controlsStyle = QmlDesignerPlugin::instance()->settings().controlsStyle;
if (!controlsStyle.isEmpty()) if (!controlsStyle.isEmpty())
@@ -463,7 +465,7 @@ bool PuppetCreator::checkPuppetVersion(const QString &qmlPuppetPath)
{ {
QProcess qmlPuppetVersionProcess; QProcess qmlPuppetVersionProcess;
qmlPuppetVersionProcess.start(qmlPuppetPath, QStringList() << "--version"); qmlPuppetVersionProcess.start(qmlPuppetPath, QStringList() << QLatin1String("--version"));
qmlPuppetVersionProcess.waitForReadyRead(6000); qmlPuppetVersionProcess.waitForReadyRead(6000);
QByteArray versionString = qmlPuppetVersionProcess.readAll(); QByteArray versionString = qmlPuppetVersionProcess.readAll();