diff options
| author | El Mehdi Fekari <mfekari@rim.com> | 2013-07-01 15:09:10 +0200 |
|---|---|---|
| committer | Mehdi Fekari <mfekari@blackberry.com> | 2013-07-04 14:14:06 +0200 |
| commit | 10f2e59aed9964f6c1d284651b3c724d98061efb (patch) | |
| tree | 7ceabb8930421c325e59e8a72d2740a0af2e7560 /src/plugins/qnx/blackberryconfiguration.h | |
| parent | 6773d47a635df1da3945cf4023304592a7adb67e (diff) | |
| download | qt-creator-10f2e59aed9964f6c1d284651b3c724d98061efb.tar.gz | |
Qnx: Add BlackBerry kits for qt5
Qt5 is available in the internal 10.2 NDK builds.
N.B: This is for testing purpose (internal developers).
Change-Id: I0858e05f5902d602a0f921ed22f34b79d557a10a
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Diffstat (limited to 'src/plugins/qnx/blackberryconfiguration.h')
| -rw-r--r-- | src/plugins/qnx/blackberryconfiguration.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/qnx/blackberryconfiguration.h b/src/plugins/qnx/blackberryconfiguration.h index d538f610ef..8ea1887b10 100644 --- a/src/plugins/qnx/blackberryconfiguration.h +++ b/src/plugins/qnx/blackberryconfiguration.h @@ -54,7 +54,8 @@ class BlackBerryConfig { QString ndkPath; QString targetName; - Utils::FileName qmakeBinaryFile; + Utils::FileName qmake4BinaryFile; + Utils::FileName qmake5BinaryFile; Utils::FileName gccCompiler; Utils::FileName deviceDebuger; Utils::FileName simulatorDebuger; @@ -72,7 +73,8 @@ class BlackBerryConfiguration: public QObject public: static BlackBerryConfiguration &instance(); BlackBerryConfig config() const; - Utils::FileName qmakePath() const; + Utils::FileName qmake4Path() const; + Utils::FileName qmake5Path() const; Utils::FileName gccPath() const; Utils::FileName deviceGdbPath() const; Utils::FileName simulatorGdbPath() const; @@ -110,7 +112,8 @@ private: void saveNdkSettings(); bool refresh(); bool setNdkPath(const QString &ndkPath); - QtSupport::BaseQtVersion* createQtVersion(); + void setupNdkConfigPerQtVersion(const Utils::FileName &qmakePath, ProjectExplorer::GccToolChain* tc); + QtSupport::BaseQtVersion* createQtVersion(const Utils::FileName &qmakePath); ProjectExplorer::GccToolChain* createGccToolChain(); ProjectExplorer::Kit* createKit(QnxArchitecture arch, QtSupport::BaseQtVersion* qtVersion, ProjectExplorer::GccToolChain* tc); |