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

Qnx: Use Utils::Environment for qnx environment

Browse Source 
Change-Id: I499ca9be0abc15fc0c57847ff288e80612a536fe
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Mehdi Fekari
2013-10-12 19:20:37 +02:00
parent 295c688469
commit ab4207acf2
15 changed files with 114 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qnx/blackberryqtversion.cpp
View File

@@ -103,14 +103,15 @@ void BlackBerryQtVersion::fromMap(const QVariantMap &map)
m_ndkEnvFile = map.value(NndkEnvFile).toString();
}
QMultiMap<QString, QString> BlackBerryQtVersion::environment() const
QList<Utils::EnvironmentItem> BlackBerryQtVersion::environment() const
{
QTC_CHECK(!sdkPath().isEmpty());
if (sdkPath().isEmpty())
return QMultiMap<QString, QString>();
return QList<Utils::EnvironmentItem>();
QString envFile = m_ndkEnvFile.isEmpty() ? QnxUtils::envFilePath(sdkPath()) : m_ndkEnvFile;
QMultiMap<QString,QString> result = QnxUtils::parseEnvironmentFile(envFile);
QList<Utils::EnvironmentItem> env = QnxUtils::qnxEnvironmentFromNdkFile(envFile);
// BB NDK Host is having qmake executable which is using qt.conf file to specify
// base information. The qt.conf file is using 'CPUVARDIR' environment variable
// to provide correct information for both x86 and armle-v7 architectures.
@@ -119,9 +120,11 @@ QMultiMap<QString, QString> BlackBerryQtVersion::environment() const
// CPUVARDIR to match expected architecture() otherwise qmake environment is
// always resolved to be for armle-v7 architecture only as it is specified
// BB NDK environment file.
result.replace(QLatin1String("CPUVARDIR"),
architecture() == X86 ? QLatin1String("x86") : QLatin1String("armle-v7"));
return result;
env.append(Utils::EnvironmentItem(QLatin1String("CPUVARDIR"),
architecture() == X86 ? QLatin1String("x86") : QLatin1String("armle-v7")));
return env;
}
void BlackBerryQtVersion::setDefaultSdkPath()