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

Maemo: Fix Qemu start on Mac.

Browse Source 
(cherry picked from commit 5427f7bf8b)
This commit is contained in:
Christian Kandeler
2010-08-18 16:38:29 +02:00
committed by hjk
parent 901ea3e461
commit f56e90f53d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,9 +352,13 @@ void QemuRuntimeManager::startRuntime()
env.insert(key, env.value(key) % colon % root % QLatin1String("bin")); env.insert(key, env.value(key) % colon % root % QLatin1String("bin"));
env.insert(key, env.value(key) % colon % root % QLatin1String("madlib")); env.insert(key, env.value(key) % colon % root % QLatin1String("madlib"));
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
# if defined(Q_OS_MAC)
const QLatin1String key("DYLD_LIBRARY_PATH");
# else
const QLatin1String key("LD_LIBRARY_PATH"); const QLatin1String key("LD_LIBRARY_PATH");
# endif // MAC
env.insert(key, env.value(key) % QLatin1Char(':') % rt.m_libPath); env.insert(key, env.value(key) % QLatin1Char(':') % rt.m_libPath);
#endif #endif // WIN/UNIX
m_qemuProcess->setProcessEnvironment(env); m_qemuProcess->setProcessEnvironment(env);
m_qemuProcess->setWorkingDirectory(rt.m_root); m_qemuProcess->setWorkingDirectory(rt.m_root);