From 5427f7bf8b24b96bedb2919491716a9289f0bfe5 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Wed, 18 Aug 2010 16:38:29 +0200
Subject: [PATCH] Maemo: Fix Qemu start on Mac.
---
.../qt4projectmanager/qt-maemo/qemuruntimemanager.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
index b0890073120..d33e39b162c 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);
--
GitLab