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

Use the full path to the qemu executable, might fix QTCREATORBUG-1656.

Browse Source 
Task-number: QTCREATORBUG-1656
This commit is contained in:
kh1
2010-06-17 15:57:08 +02:00
parent cfdb5d7446
commit a89c171cb1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
View File

@@ -379,9 +379,9 @@ void QemuRuntimeManager::startRuntime()
m_qemuProcess->setProcessEnvironment(env); m_qemuProcess->setProcessEnvironment(env);
m_qemuProcess->setWorkingDirectory(rt.m_root); m_qemuProcess->setWorkingDirectory(rt.m_root);
const QString app =(QFileInfo(rt.m_bin).isRelative() const QString app = root + (QFileInfo(rt.m_bin).isRelative()
? root % QLatin1String("madlib/") % rt.m_bin // Fremantle. ? QLatin1String("madlib/") % rt.m_bin // Fremantle.
: rt.m_bin) // Haramattan. : rt.m_bin) // Haramattan.
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
% QLatin1String(".exe") % QLatin1String(".exe")
#endif #endif
@@ -389,6 +389,9 @@ void QemuRuntimeManager::startRuntime()
m_qemuProcess->start(app % QLatin1Char(' ') % rt.m_args, m_qemuProcess->start(app % QLatin1Char(' ') % rt.m_args,
QIODevice::ReadWrite); QIODevice::ReadWrite);
if (!m_qemuProcess->waitForStarted())
return;
emit qemuProcessStatus(QemuStarting); emit qemuProcessStatus(QemuStarting);
connect(m_qemuAction, SIGNAL(triggered()), this, SLOT(terminateRuntime())); connect(m_qemuAction, SIGNAL(triggered()), this, SLOT(terminateRuntime()));
disconnect(m_qemuAction, SIGNAL(triggered()), this, SLOT(startRuntime())); disconnect(m_qemuAction, SIGNAL(triggered()), this, SLOT(startRuntime()));