Replace Q_OS_OSX with Q_OS_MACOS

Change-Id: I1e408b9676a9bfc299dcd45f1c790827e316db30
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit bec0b8a05d349a052504b9c11caa259a63012210)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

6 files changed, 9 insertions, 9 deletions

diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/main.cpp b/examples/qml/tutorials/extending-qml/chapter6-plugins/main.cpp
index 3475401ebd..ca32bd91b4 100644
--- a/examples/qml/tutorials/extending-qml/chapter6-plugins/main.cpp
+++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/main.cpp
@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 //![0]
     QQuickView view;
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
     view.engine()->addImportPath(app.applicationDirPath() + "/../PlugIns");
 #endif
 //![0]
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index d91a70ed90..2754ea5249 100644
--- a/src/quick/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -441,7 +441,7 @@ QQuickMultiPointTouchArea::QQuickMultiPointTouchArea(QQuickItem *parent)
         setFlag(QQuickItem::ItemHasContents);
     }
     setAcceptTouchEvents(true);
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
     setAcceptHoverEvents(true); // needed to enable touch events on mouse hover.
 #endif
 }
@@ -745,7 +745,7 @@ void QQuickMultiPointTouchArea::addTouchPoint(const QMouseEvent *e)
     _mouseTouchPoint = dtp;
 }
 
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
 void QQuickMultiPointTouchArea::hoverEnterEvent(QHoverEvent *event)
 {
     setTouchEventsEnabled(isEnabled());
@@ -776,7 +776,7 @@ void QQuickMultiPointTouchArea::itemChange(ItemChange change, const ItemChangeDa
         setAcceptHoverEvents(data.boolValue);
     QQuickItem::itemChange(change, data);
 }
-#endif // Q_OS_OSX
+#endif // Q_OS_MACOS
 
 void QQuickMultiPointTouchArea::addTouchPrototype(QQuickTouchPoint *prototype)
 {
diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index 4419757c30..97736d7aef 100644
--- a/src/quick/items/qquickmultipointtoucharea_p.h
+++ b/src/quick/items/qquickmultipointtoucharea_p.h
@@ -263,7 +263,7 @@ protected:
     bool shouldFilter(QEvent *event);
     void grabGesture(QPointingDevice *dev);
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
     void hoverEnterEvent(QHoverEvent *event) override;
     void hoverLeaveEvent(QHoverEvent *event) override;
     void setTouchEventsEnabled(bool enable);
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index d547fae6c9..482941b9ba 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -247,7 +247,7 @@ QQuickPinchArea::QQuickPinchArea(QQuickItem *parent)
     Q_D(QQuickPinchArea);
     d->init();
     setAcceptTouchEvents(true);
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
     setAcceptHoverEvents(true); // needed to enable touch events on mouse hover.
 #endif
 }
diff --git a/src/quicklayouts/qquicklayoutstyleinfo.cpp b/src/quicklayouts/qquicklayoutstyleinfo.cpp
index 6f0a3a4087..bfd3544b59 100644
--- a/src/quicklayouts/qquicklayoutstyleinfo.cpp
+++ b/src/quicklayouts/qquicklayoutstyleinfo.cpp
@@ -21,7 +21,7 @@ qreal QQuickLayoutStyleInfo::spacing(Qt::Orientation /*orientation*/) const
     qreal spacing = 5.0;
 #endif
 
-#ifndef Q_OS_OSX
+#ifndef Q_OS_MACOS
     // On OS X the DPI is always 72 so we should not scale it
     spacing = qRound(spacing * (qreal(qt_defaultDpiX()) / 96.0));
 #endif
diff --git a/src/quicktestutils/qml/platformquirks_p.h b/src/quicktestutils/qml/platformquirks_p.h
index 0170d054e0..6bbdf81bee 100644
--- a/src/quicktestutils/qml/platformquirks_p.h
+++ b/src/quicktestutils/qml/platformquirks_p.h
@@ -17,7 +17,7 @@
 
 #include <private/qglobal_p.h>
 
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
 #include <Carbon/Carbon.h>
 #endif
 
@@ -29,7 +29,7 @@ struct PlatformQuirks
     {
 #if !QT_CONFIG(clipboard)
         return false;
-#elif defined(Q_OS_OSX)
+#elif defined(Q_OS_MACOS)
         PasteboardRef pasteboard;
         OSStatus status = PasteboardCreate(0, &pasteboard);
         if (status == noErr)