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

Qnx: Refactor BlackBerryApiLevelConfiguration class

Browse Source 
Add a QnxBaseConfiguration class as base class for
the BlackBerryApiLevelConfiguration and the new
QnxConfiguarion classes.

The split of the BlackBerryApiLevelConfiguration logic
makes the code more flexible to add support for
the user's SDP/Qnx configurations.

Upcoming patches adding support for the SDP/Qnx configuration
will depend on this change.

Change-Id: I44258d9a9f0dc44bb196f4178974ad04d4caf70a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
El Mehdi Fekari
2014-03-12 17:43:26 +01:00
committed by Mehdi Fekari
parent ec94e042d9
commit 4e78a95263
14 changed files with 582 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,7 @@ QList<Utils::EnvironmentItem> BlackBerryQtVersion::environment() const
return QList<Utils::EnvironmentItem>();
QString envFile = m_ndkEnvFile.isEmpty() ? QnxUtils::envFilePath(sdkPath()) : m_ndkEnvFile;
QList<Utils::EnvironmentItem> env = QnxUtils::qnxEnvironmentFromNdkFile(envFile);
QList<Utils::EnvironmentItem> env = QnxUtils::qnxEnvironmentFromEnvFile(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