diff options
| author | Tobias Nätterlund <tobias.naetterlund.qnx@kdab.com> | 2013-12-03 17:02:07 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-12-05 08:52:48 +0100 |
| commit | af1a92070a09a726cbf8b94be138b1e9921c06ab (patch) | |
| tree | 8ebbdc34638c8c0320162ac7241256adfab565a2 | |
| parent | f3292a442d568994396995b140dd70e7754f1b83 (diff) | |
QNX: Use correct command for running the SDK installer
Depending on NDK version, the application used for the
SDK installer is different.
Without this, the installation of NDK's is not possible
from within Qt Creator.
Change-Id: I71ba67ccb05d30bcef5b63e7e397e545c5a89e3e
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| -rw-r--r-- | src/plugins/qnx/qnxutils.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp index c15696ad8b..600c587406 100644 --- a/src/plugins/qnx/qnxutils.cpp +++ b/src/plugins/qnx/qnxutils.cpp @@ -287,8 +287,12 @@ QString QnxUtils::qdeInstallProcess(const QString &ndkPath, const QString &optio if (installerPath.isEmpty()) return QString(); - return QString::fromLatin1("%1 -nosplash -application com.qnx.tools.ide.sdk.manager.core.SDKInstallerApplication " - "%2 %3 -vmargs -Dosgi.console=:none").arg(installerPath, option, version); + const QDir pluginDir(ndkPath + QLatin1String("/plugins")); + const QStringList installerPlugins = pluginDir.entryList(QStringList() << QLatin1String("com.qnx.tools.ide.sdk.installer.app_*.jar")); + const QString installerApplication = installerPlugins.size() >= 1 ? QLatin1String("com.qnx.tools.ide.sdk.installer.app.SDKInstallerApplication") + : QLatin1String("com.qnx.tools.ide.sdk.manager.core.SDKInstallerApplication"); + return QString::fromLatin1("%1 -nosplash -application %2 " + "%3 %4 -vmargs -Dosgi.console=:none").arg(installerPath, installerApplication, option, version); } QList<Utils::EnvironmentItem> QnxUtils::qnxEnvironment(const QString &sdkPath) |