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

Maemo: Set Qemu environment once instead of at every start.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
Christian Kandeler
2010-11-30 18:09:45 +01:00
parent 233081aadb
commit cead4f3974
4 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
View File

@@ -353,22 +353,8 @@ void MaemoQemuManager::startRuntime()
m_runningQtId = version->uniqueId();
const MaemoQemuRuntime rt = m_runtimes.value(version->uniqueId());
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
#ifdef Q_OS_WIN
const QString root
= QDir::toNativeSeparators(MaemoGlobal::maddeRoot(version->qmakeCommand())
+ QLatin1Char('/'));
const QLatin1Char colon(';');
const QLatin1String key("PATH");
env.insert(key, root % QLatin1String("bin") % colon % env.value(key));
env.insert(key, root % QLatin1String("madlib") % colon % env.value(key));
#endif
for (QHash<QString, QString>::ConstIterator it = rt.m_environment.constBegin();
it != rt.m_environment.constEnd(); ++it)
env.insert(it.key(), it.value());
m_qemuProcess->setProcessEnvironment(env);
m_qemuProcess->setProcessEnvironment(rt.m_environment);
m_qemuProcess->setWorkingDirectory(rt.m_root);
m_qemuProcess->start(rt.m_bin % QLatin1Char(' ') % rt.m_args);
if (!m_qemuProcess->waitForStarted())
return;