diff options
| author | ck <qt-info@nokia.com> | 2010-06-04 13:12:47 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-06-04 13:33:27 +0200 |
| commit | 400e8adfabcc502dbe82330dda87692046378c05 (patch) | |
| tree | 814fb71de19d59e4a288b4ba080347d733bdc035 | |
| parent | af96a8c901f2e67144fc60631d7286bbf110959f (diff) | |
Maemo: Adapt qemu path for Harmattan.
Reviewed-by: kh1
(cherry picked from commit 63ef0d3613495a21f38c20a0c2a3b3deb9d30ee1)
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp index 3d16648d76..1567edb9c4 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp @@ -379,7 +379,9 @@ void QemuRuntimeManager::startRuntime() m_qemuProcess->setProcessEnvironment(env); m_qemuProcess->setWorkingDirectory(rt.m_root); - const QString app = root % QLatin1String("madlib/") % rt.m_bin + const QString app =(QFileInfo(rt.m_bin).isRelative() + ? root % QLatin1String("madlib/") % rt.m_bin // Fremantle. + : rt.m_bin) // Haramattan. #ifdef Q_OS_WIN % QLatin1String(".exe") #endif |