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

Qnx: Add support for pure QNX configurations

Browse Source 
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>
This commit is contained in:
El Mehdi Fekari
2014-04-08 19:33:27 +02:00
committed by Mehdi Fekari
parent f1795d9748
commit 317fe1f447
32 changed files with 1162 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();