From 16d3881b5b22034b940cd271b81bc54fa89bd34e Mon Sep 17 00:00:00 2001
From: El Mehdi Fekari <mfekari@blackberry.com>
Date: Mon, 12 May 2014 09:42:59 +0200
Subject: [PATCH] Qnx: Detect Qt version for BB10 with the new mkspec changes

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>
---
 src/plugins/qnx/blackberryqtversionfactory.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qnx/blackberryqtversionfactory.cpp b/src/plugins/qnx/blackberryqtversionfactory.cpp
index aed3308ca29..18f5006733d 100644
--- a/src/plugins/qnx/blackberryqtversionfactory.cpp
+++ b/src/plugins/qnx/blackberryqtversionfactory.cpp
@@ -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);