diff options
| author | El Mehdi Fekari <mfekari@rim.com> | 2013-06-12 14:40:30 +0200 |
|---|---|---|
| committer | Mehdi Fekari <mfekari@blackberry.com> | 2013-06-24 23:03:15 +0200 |
| commit | 728fe7d7c0ea88c27f1436cfe75ad16f6082b601 (patch) | |
| tree | 029bb779aa1b75ea10ea64da3ad0f7150c37a14a /src/plugins/qnx/qnxutils.h | |
| parent | 6b2162f2a95bcba6ac7284a580f803d1485a6932 (diff) | |
| download | qt-creator-728fe7d7c0ea88c27f1436cfe75ad16f6082b601.tar.gz | |
Qnx: Add support for internal 10.2 NDKs
Some changes in the new NDK 10.2 break the setup of BlackBerry 10.
Main changes that the current patch covers:
* Qnx environment variables are evaluated when sourcing the bbndk-env script
and are no longer hard coded when istalling the NDK
* The version number is appended to the bbndk-env file name.
More eventual changes may come and we may need to directly
parse the ndk xml descriptor file.
Task-number: QTCREATORBUG-9403
Change-Id: Ie7daf7b0eaf2a49339775cacb9973062d6101afa
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Diffstat (limited to 'src/plugins/qnx/qnxutils.h')
| -rw-r--r-- | src/plugins/qnx/qnxutils.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qnx/qnxutils.h b/src/plugins/qnx/qnxutils.h index 571a11f644..f12518fd31 100644 --- a/src/plugins/qnx/qnxutils.h +++ b/src/plugins/qnx/qnxutils.h @@ -58,6 +58,8 @@ public: static void prependQnxMapToEnvironment(const QMultiMap<QString, QString> &qnxMap, Utils::Environment &env); static Utils::FileName executableWithExtension(const Utils::FileName &fileName); static QString dataDirPath(); + static QString qConfigPath(); + static QString ndkVersion(const QString& ndkPath); }; } // namespace Internal |