diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-06-24 13:54:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-24 14:43:41 +0200 |
| commit | cf01eac77c555fa559e52bdd32c71c960ac741f5 (patch) | |
| tree | 912414a542ae43c1a8c52d05ab156da4fbb976a0 /src/qml | |
| parent | 55ba0b974c920f7f3771f5e16b4af75be1c511a7 (diff) | |
QQmlPlatform: rename "mac" to "osx"
Change-Id: Ie458690b8008b211785cf9dcc0312a7e25c84f6b
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmlplatform.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 64662138e1..9998af3890 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -391,9 +391,9 @@ The following functions are also on the Qt object. \list \li \c "android" - Android \li \c "blackberry" - BlackBerry OS - \li \c "ios" - Apple iOS + \li \c "ios" - iOS \li \c "linux" - Linux - \li \c "mac" - Mac OS X + \li \c "osx" - OS X \li \c "unix" - Other Unix-based OS \li \c "windows" - Windows \li \c "wince" - Windows CE diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp index de48f60f56..04862379be 100644 --- a/src/qml/qml/qqmlplatform.cpp +++ b/src/qml/qml/qqmlplatform.cpp @@ -66,7 +66,7 @@ QString QQmlPlatform::os() #elif defined(Q_OS_IOS) return QLatin1String("ios"); #elif defined(Q_OS_MAC) - return QLatin1String("mac"); + return QLatin1String("osx"); #elif defined(Q_OS_WINCE) return QLatin1String("wince"); #elif defined(Q_OS_WIN) |