diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-06 18:05:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-06 18:05:07 +0100 |
| commit | 692ff260851575171be6751a7bdf34a744c2ed9d (patch) | |
| tree | 67c2ee80fb6a477f731ebc1898a5dfd43c878d2d /src/qml/qml/qqmlplatform.cpp | |
| parent | 8740f35e69dad301eeaa2fc4b74ecab661cdc0c4 (diff) | |
| parent | 5cb76fb3704947cfc4d575695b137460ecc8bbd9 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I1ed923d72566af663555898c3ec708191eef8ae9
Diffstat (limited to 'src/qml/qml/qqmlplatform.cpp')
| -rw-r--r-- | src/qml/qml/qqmlplatform.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp index a8c402af2e..0acf20bbb4 100644 --- a/src/qml/qml/qqmlplatform.cpp +++ b/src/qml/qml/qqmlplatform.cpp @@ -72,6 +72,8 @@ QString QQmlPlatform::os() return QStringLiteral("windows"); #elif defined(Q_OS_LINUX) return QStringLiteral("linux"); +#elif defined(Q_OS_QNX) + return QStringLiteral("qnx"); #elif defined(Q_OS_UNIX) return QStringLiteral("unix"); #else |