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

Qnx: Detect Qt version for BB10 with the new mkspec changes

Browse Source 
Task-number: QTCREATORBUG-12222
Change-Id: I28cfc2a3d35f55576bd52ecb720d74c6d432786e
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
El Mehdi Fekari
2014-05-12 09:42:59 +02:00
committed by Mehdi Fekari
parent e90b0c128e
commit 16d3881b5b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qnx/blackberryqtversionfactory.cpp
View File

@@ -79,7 +79,8 @@ QtSupport::BaseQtVersion *BlackBerryQtVersionFactory::create(const Utils::FileNa
if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
return 0;
if (evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("blackberry"))) {
if (evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("blackberry")) ||
evaluator->values(QLatin1String("QMAKE_PLATFORM")).contains(QLatin1String("blackberry"))) {
QString cpuDir = evaluator->value(QLatin1String("QNX_CPUDIR"));
return new BlackBerryQtVersion(QnxUtils::cpudirToArch(cpuDir), qmakePath,
isAutoDetected, autoDetectionSource);