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>

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 6466213..9998af3 100644 (file)
--- 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 de48f60..0486237 100644 (file)
--- 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)