6 files changed, 10 insertions, 10 deletions
diff --git a/examples/quick/controls/gallery/content/ModelView.qml b/examples/quick/controls/gallery/content/ModelView.qml
index e6a6040f..483d99ee 100644
--- a/examples/quick/controls/gallery/content/ModelView.qml
+++ b/examples/quick/controls/gallery/content/ModelView.qml
@@ -51,7 +51,7 @@ Item {
     width: 600
     height: 300
     anchors.fill: parent
-    anchors.margins: Qt.platform.os === "mac" ? 12 : 6
+    anchors.margins: Qt.platform.os === "osx" ? 12 : 6
 
 //    XmlListModel {
 //        id: flickerModel
diff --git a/examples/quick/controls/gallery/main.qml b/examples/quick/controls/gallery/main.qml
index 8ea3cf9e..ec00627b 100644
--- a/examples/quick/controls/gallery/main.qml
+++ b/examples/quick/controls/gallery/main.qml
@@ -228,7 +228,7 @@ ApplicationWindow {
         enabled: enabledCheck.checked
         tabPosition: controlPage.item ? controlPage.item.tabPosition : Qt.TopEdge
         anchors.fill: parent
-        anchors.margins: Qt.platform.os === "mac" ? 12 : 2
+        anchors.margins: Qt.platform.os === "osx" ? 12 : 2
 
         Tab {
             id: controlPage
diff --git a/examples/quick/controls/tableview/main.qml b/examples/quick/controls/tableview/main.qml
index 3ecf5ddb..1a9246f8 100644
--- a/examples/quick/controls/tableview/main.qml
+++ b/examples/quick/controls/tableview/main.qml
@@ -129,7 +129,7 @@ Window {
             focus:true
             enabled: enabledCheck.checked
 
-            property int margins: Qt.platform.os === "mac" ? 16 : 0
+            property int margins: Qt.platform.os === "osx" ? 16 : 0
 
             height: parent.height - 34
             anchors.right: parent.right
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index 6f05d605..b02a49c0 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -393,7 +393,7 @@ ScrollView {
     implicitHeight: 150
 
     frameVisible: true
-    __scrollBarTopMargin: Qt.platform.os === "mac" ? headerrow.height : 0
+    __scrollBarTopMargin: Qt.platform.os === "osx" ? headerrow.height : 0
     __viewTopMargin: headerrow.height
 
     /*! \internal */
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index c36218a3..4cb57351 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -217,20 +217,20 @@ TestCase {
     }
 
     function test_activeFocusOnPress(){
-        if (Qt.platform.os === "mac")
+        if (Qt.platform.os === "osx")
             skip("When the menu pops up on OS X, it does not return and the test fails after time out")
 
         var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { model: 4 }', container, '');
         comboBox.activeFocusOnPress = false
         verify(!comboBox.activeFocus)
-        if (Qt.platform.os === "mac") // on mac when the menu open, the __popup function does not return
+        if (Qt.platform.os === "osx") // on mac when the menu open, the __popup function does not return
             timer.start()
         else // two mouse clicks to open and close the popup menu
             mouseClick(comboBox, comboBox.x + 1, comboBox.y + 1)
         mouseClick(comboBox, comboBox.x + 1, comboBox.y + 1)
         verify(!comboBox.activeFocus)
         comboBox.activeFocusOnPress = true
-        if (Qt.platform.os === "mac") // on mac when the menu open, the __popup function does not return
+        if (Qt.platform.os === "osx") // on mac when the menu open, the __popup function does not return
             timer.start()
         else // two mouse clicks to open and close the popup menu
             mouseClick(comboBox, comboBox.x + 1, comboBox.y + 1)
@@ -240,7 +240,7 @@ TestCase {
     }
 
     function test_spaceKey(){
-        if (Qt.platform.os === "mac")
+        if (Qt.platform.os === "osx")
             skip("When the menu pops up on OS X, it does not return and the test fails after time out")
 
         var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { model: 4 }', container, '');
@@ -259,7 +259,7 @@ TestCase {
     }
 
     function test_currentIndexInMenu() {
-        if (Qt.platform.os === "mac")
+        if (Qt.platform.os === "osx")
             skip("When the menu pops up on OS X, it does not return and the test fails after time out")
 
         var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { model: 4 }', container, '');
diff --git a/tests/auto/controls/data/tst_shortcuts.qml b/tests/auto/controls/data/tst_shortcuts.qml
index c0a668d4..b28d24a9 100644
--- a/tests/auto/controls/data/tst_shortcuts.qml
+++ b/tests/auto/controls/data/tst_shortcuts.qml
@@ -78,7 +78,7 @@ TestCase {
             { key: Qt.Key_D, modifier: Qt.AltModifier, expected: "alt d pressed" },
             { key: Qt.Key_T, modifier: Qt.NoModifier, expected: "no key press" },
             // on mac we don't have mnemonics
-            { key: Qt.Key_T, modifier: Qt.AltModifier, expected: Qt.platform.os === "mac" ? "no key press" : "alt t pressed" },
+            { key: Qt.Key_T, modifier: Qt.AltModifier, expected: Qt.platform.os === "osx" ? "no key press" : "alt t pressed" },
         ]
     }