Commit 16d3881b authored by El Mehdi Fekari's avatar El Mehdi Fekari Committed by Mehdi Fekari

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

Task-number: QTCREATORBUG-12222
Change-Id: I28cfc2a3d35f55576bd52ecb720d74c6d432786e
Reviewed-by: default avatarSergio Ahumada <sahumada@blackberry.com>
Reviewed-by: default avatarWolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent e90b0c12
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment