feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qnx: Refactor BlackBerryConfiguration

Browse Source 
Improve the NDK setting page to enable managing multiple NDKs.

* Refactor BlackBerryConfiguration to support multiple configurations
* Add auto detected kits for installed NDKs
* Add/Remove manual NDKs

Change-Id: Icbc850551da3f729ccaa3473da720ade3051adaf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
This commit is contained in:
Mehdi Fekari
2013-07-04 16:21:33 +02:00
committed by Mehdi Fekari
parent 2ac65aaa7c
commit 7b313e9696
22 changed files with 997 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/qnx/qnxutils.cpp
View File

@@ -262,9 +262,20 @@ QString QnxUtils::qConfigPath()
QString QnxUtils::ndkVersion(const QString &ndkPath)
{
foreach (const NdkInstallInformation &ndkInfo, installedNdks()) {
if (!ndkInfo.path.compare(ndkPath, Utils::HostOsInfo::fileNameCaseSensitivity()))
return ndkInfo.version;
}
return QString();
}
QList<NdkInstallInformation> QnxUtils::installedNdks()
{
QList<NdkInstallInformation> ndkList;
QString ndkConfigPath = qConfigPath();
if (!QDir(ndkConfigPath).exists())
return QString();
return ndkList;
QFileInfoList ndkfileList = QDir(ndkConfigPath).entryInfoList(QStringList() << QLatin1String("*.xml"),
QDir::Files, QDir::Time);
@@ -285,11 +296,16 @@ QString QnxUtils::ndkVersion(const QString &ndkPath)
// The file contains only one installation node
if (!childElt.isNull()) {
// The file contains only one base node
QDomElement elt = childElt.firstChildElement(QLatin1String("base"));
if (!elt.text().compare(ndkPath, Utils::HostOsInfo::fileNameCaseSensitivity()))
return childElt.firstChildElement(QLatin1String("version")).text();
NdkInstallInformation ndkInfo;
ndkInfo.path = childElt.firstChildElement(QLatin1String("base")).text();
ndkInfo.name = childElt.firstChildElement(QLatin1String("name")).text();
ndkInfo.host = childElt.firstChildElement(QLatin1String("host")).text();
ndkInfo.target = childElt.firstChildElement(QLatin1String("target")).text();
ndkInfo.version = childElt.firstChildElement(QLatin1String("version")).text();
ndkList.append(ndkInfo);
}
}
return QString();
return ndkList;
}