Qnx: Add support for pure QNX configurations

This is a first patch that adds basic support to manage
user's QNX configurations.

Change-Id: I273939d39e4353dabc2ae3873d7d7be6b3ca9d47
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>

1 files changed, 12 insertions, 9 deletions

diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp
index ff7e5c6e08..7dc0afce79 100644
--- a/src/plugins/qnx/qnxutils.cpp
+++ b/src/plugins/qnx/qnxutils.cpp
@@ -186,7 +186,7 @@ Utils::FileName QnxUtils::executableWithExtension(const Utils::FileName &fileNam
     return result;
 }
 
-QString QnxUtils::dataDirPath()
+QString QnxUtils::bbDataDirPath()
 {
     const QString homeDir = QDir::homePath();
 
@@ -208,17 +208,17 @@ QString QnxUtils::dataDirPath()
     return QString();
 }
 
-QString QnxUtils::qConfigPath()
+QString QnxUtils::bbqConfigPath()
 {
     if (Utils::HostOsInfo::isMacHost() || Utils::HostOsInfo::isWindowsHost())
-        return dataDirPath() + QLatin1String("/BlackBerry Native SDK/qconfig");
+        return bbDataDirPath() + QLatin1String("/BlackBerry Native SDK/qconfig");
     else
-        return dataDirPath() + QLatin1String("/bbndk/qconfig");
+        return bbDataDirPath() + QLatin1String("/bbndk/qconfig");
 }
 
 QString QnxUtils::defaultTargetVersion(const QString &ndkPath)
 {
-    foreach (const NdkInstallInformation &ndkInfo, installedNdks()) {
+    foreach (const ConfigInstallInformation &ndkInfo, installedConfigs()) {
         if (!ndkInfo.path.compare(ndkPath, Utils::HostOsInfo::fileNameCaseSensitivity()))
             return ndkInfo.version;
     }
@@ -226,10 +226,13 @@ QString QnxUtils::defaultTargetVersion(const QString &ndkPath)
     return QString();
 }
 
-QList<NdkInstallInformation> QnxUtils::installedNdks()
+QList<ConfigInstallInformation> QnxUtils::installedConfigs(const QString &configPath)
 {
-    QList<NdkInstallInformation> ndkList;
-    QString ndkConfigPath = qConfigPath();
+    QList<ConfigInstallInformation> ndkList;
+    QString ndkConfigPath = configPath;
+    if (ndkConfigPath.isEmpty())
+        ndkConfigPath = bbqConfigPath();
+
     if (!QDir(ndkConfigPath).exists())
         return ndkList;
 
@@ -252,7 +255,7 @@ QList<NdkInstallInformation> QnxUtils::installedNdks()
         // The file contains only one installation node
         if (!childElt.isNull()) {
             // The file contains only one base node
-            NdkInstallInformation ndkInfo;
+            ConfigInstallInformation ndkInfo;
             ndkInfo.path = childElt.firstChildElement(QLatin1String("base")).text();
             ndkInfo.name = childElt.firstChildElement(QLatin1String("name")).text();
             ndkInfo.host = childElt.firstChildElement(QLatin1String("host")).text();