diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-25 15:03:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-25 15:03:03 +0200 |
| commit | 3e20d1059a612ba5a6d3c049fe93f780f3ba3e58 (patch) | |
| tree | ee20524e6bf4cfb41ea5b3bf867bc546abf9edd9 /src/qml/qml | |
| parent | 1aa91f8b0b140c417c6e97dfd22fa498d31bceb6 (diff) | |
| parent | 2416b9d6cc2950395151c18a7f7bfceb4b7fc693 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3
Change-Id: Ie5d0b2d9bece98553262f8af1ce66459f03a73e1
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 1 | ||||
| -rw-r--r-- | src/qml/qml/qqmlplatform.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 3ce50132c3..8f3c8ea8dd 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -445,6 +445,7 @@ The following functions are also on the Qt object. \li \c "tvos" - tvOS \li \c "linux" - Linux \li \c "osx" - \macos + \li \c "qnx" - QNX (since Qt 5.9.3) \li \c "unix" - Other Unix-based OS \li \c "windows" - Windows \li \c "winrt" - WinRT / UWP 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 |