From d77339875a853266cd043ae9f184a776aa7d2a6d Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 21 Sep 2017 13:20:36 +0200 Subject: Return "qnx" for Qt.platform.os when appropriate [ChangeLog][QtQml] Qt.platform.os returns "qnx" when running on QNX platforms. Task-number: QTBUG-52515 Change-Id: Ie46f235248f7832fff12906cf858e8527e8060b1 Reviewed-by: Edward Welbourne Reviewed-by: J-P Nurmi --- src/qml/qml/qqmlplatform.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/qml/qml/qqmlplatform.cpp') diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp index 165cde5eb3..0d6ab36066 100644 --- a/src/qml/qml/qqmlplatform.cpp +++ b/src/qml/qml/qqmlplatform.cpp @@ -71,6 +71,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 -- cgit v1.2.3