summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2010-08-18 16:38:29 +0200
committerChristian Kandeler <christian.kandeler@nokia.com>2010-08-18 16:38:29 +0200
commit5427f7bf8b24b96bedb2919491716a9289f0bfe5 (patch)
tree18c0dd8fc8a210dcd21603041604eb38860f154e
parent3e31a770b5aa882c4fccdea65c7f8504beab032a (diff)
downloadqt-creator-5427f7bf8b24b96bedb2919491716a9289f0bfe5.tar.gz
Maemo: Fix Qemu start on Mac.
-rw-r--r--src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
index b089007312..d33e39b162 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
@@ -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("madlib"));
#elif defined(Q_OS_UNIX)
+# if defined(Q_OS_MAC)
+ const QLatin1String key("DYLD_LIBRARY_PATH");
+# else
const QLatin1String key("LD_LIBRARY_PATH");
+# endif // MAC
env.insert(key, env.value(key) % QLatin1Char(':') % rt.m_libPath);
-#endif
+#endif // WIN/UNIX
m_qemuProcess->setProcessEnvironment(env);
m_qemuProcess->setWorkingDirectory(rt.m_root);