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

Qbs: use the separate QNX OS type

Browse Source 
... 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>
This commit is contained in:
Jake Petroules
2017-04-06 18:29:53 -07:00
parent 0951589420
commit 83fd207a64
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
View File

@@ -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;