From 83fd207a640b498d9d163deb21d0ed5a85450103 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Thu, 6 Apr 2017 18:29:53 -0700
Subject: [PATCH] Qbs: use the separate QNX OS type

... instead of detecting it via the device type.

Amends e69c2eb2

Change-Id: If7bd19412e723c268d93e16d46828925b74d6a4b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
---
 .../qbsprojectmanager/defaultpropertyprovider.cpp        | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index f5a8ddb46db..84905e8f174 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -40,7 +40,6 @@
 #include <qbs.h>
 
 #include <ios/iosconstants.h>
-#include <qnx/qnxconstants.h>
 #include <winrt/winrtconstants.h>
 
 #include <QDir>
@@ -54,7 +53,6 @@ using namespace Constants;
 namespace Internal {
 using namespace ProjectExplorer::Constants;
 using namespace Ios::Constants;
-using namespace Qnx::Constants;
 using namespace WinRt::Internal::Constants;
 
 static QString extractToolchainPrefix(QString *compilerName)
@@ -119,10 +117,11 @@ static QStringList targetOSList(const ProjectExplorer::Abi &abi, const ProjectEx
         }
         os << QLatin1String("bsd") << QLatin1String("unix");
         break;
+    case ProjectExplorer::Abi::QnxOS:
+        os << QLatin1String("qnx") << QLatin1String("unix");
+        break;
     case ProjectExplorer::Abi::UnixOS:
-        if (device == QNX_QNX_OS_TYPE)
-            os << QLatin1String("qnx");
-        else if (abi.osFlavor() == ProjectExplorer::Abi::SolarisUnixFlavor)
+        if (abi.osFlavor() == ProjectExplorer::Abi::SolarisUnixFlavor)
             os << QLatin1String("solaris");
         os << QLatin1String("unix");
         break;