Commit b7fb9a44 authored by El Mehdi Fekari's avatar El Mehdi Fekari Committed by Mehdi Fekari

Qnx: Properly set Qt environment on device

Task-number: QTCREATORBUG-12171
Change-Id: I8adb7398991cf093771b561e4711b38df8aa0e27
Reviewed-by: default avatarSergio Ahumada <sahumada@blackberry.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent e7ecb490
......@@ -66,8 +66,17 @@ Utils::Environment QnxRunConfiguration::environment() const
Utils::Environment env = RemoteLinuxRunConfiguration::environment();
if (!m_qtLibPath.isEmpty()) {
env.appendOrSet(QLatin1String("LD_LIBRARY_PATH"),
m_qtLibPath + QLatin1String(":$LD_LIBRARY_PATH"));
m_qtLibPath + QLatin1String("/lib:$LD_LIBRARY_PATH"));
env.appendOrSet(QLatin1String("QML_IMPORT_PATH"),
m_qtLibPath + QLatin1String("/imports:$QML_IMPORT_PATH"));
env.appendOrSet(QLatin1String("QML2_IMPORT_PATH"),
m_qtLibPath + QLatin1String("/qml:$QML2_IMPORT_PATH"));
env.appendOrSet(QLatin1String("QT_PLUGIN_PATH"),
m_qtLibPath + QLatin1String("/plugins:$QT_PLUGIN_PATH"));
env.appendOrSet(QLatin1String("QT_QPA_FONTDIR"),
m_qtLibPath + QLatin1String("/lib/fonts:$QT_QPA_FONTDIR"));
}
return env;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment