← Back to branch summary

~iahmad/kubuntu-packaging/qtcreator

« back to all changes in this revision

Viewing changes to src/plugins/qnx/qnxutils.cpp

  • Committer: Timo Jyrinki
  • Date: 2014-01-15 07:44:24 UTC
  • mfrom: (1.1.30)
  • Revision ID: timo.jyrinki@canonical.com-20140115074424-3pnj3a1x6s25im9v
Import upstream version 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/qnx/qnxutils.cpp
287
287
    if (installerPath.isEmpty())
288
288
        return QString();
289
289
 
290
 
    return QString::fromLatin1("%1 -nosplash -application com.qnx.tools.ide.sdk.manager.core.SDKInstallerApplication "
291
 
                               "%2  %3 -vmargs -Dosgi.console=:none").arg(installerPath, option, version);
 
290
    const QDir pluginDir(ndkPath + QLatin1String("/plugins"));
 
291
    const QStringList installerPlugins = pluginDir.entryList(QStringList() << QLatin1String("com.qnx.tools.ide.sdk.installer.app_*.jar"));
 
292
    const QString installerApplication = installerPlugins.size() >= 1 ? QLatin1String("com.qnx.tools.ide.sdk.installer.app.SDKInstallerApplication")
 
293
                                                                      : QLatin1String("com.qnx.tools.ide.sdk.manager.core.SDKInstallerApplication");
 
294
    return QString::fromLatin1("%1 -nosplash -application %2 "
 
295
                               "%3  %4 -vmargs -Dosgi.console=:none").arg(installerPath, installerApplication, option, version);
292
296
}
293
297
 
294
298
QList<Utils::EnvironmentItem> QnxUtils::qnxEnvironment(const QString &sdkPath)