From 27b630c3abe9c710055dfcfd7769b7684a497d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Wed, 7 Jun 2023 02:10:07 +0200
Subject: [PATCH] Replace Q_OS_OSX with Q_OS_MACOS

Change-Id: Ibee0c259d7df86a8df58b1ad12549b145f715397
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 .../qmlpuppetcommunication/container/sharedmemory_unix.cpp    | 4 ++--
 src/libs/utils/dropsupport.cpp                                | 2 +-
 src/libs/utils/processhandle.cpp                              | 2 +-
 src/plugins/coreplugin/windowsupport.cpp                      | 2 +-
 tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libs/qmlpuppetcommunication/container/sharedmemory_unix.cpp b/src/libs/qmlpuppetcommunication/container/sharedmemory_unix.cpp
index fce49841803..76b93a3c4f9 100644
--- a/src/libs/qmlpuppetcommunication/container/sharedmemory_unix.cpp
+++ b/src/libs/qmlpuppetcommunication/container/sharedmemory_unix.cpp
@@ -15,7 +15,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
 #include <sys/posix_shm.h>
 #endif
 #include <fcntl.h>
@@ -326,7 +326,7 @@ bool SharedMemory::createInternal(QSharedMemory::AccessMode mode, size_t size)
 {
     detachInternal();
 
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
     if (m_fileHandle > -1 && m_createdByMe) {
         close(m_fileHandle);
         shm_unlink(m_nativeKey.constData());
diff --git a/src/libs/utils/dropsupport.cpp b/src/libs/utils/dropsupport.cpp
index 6def3fd1aff..9bb86f5caf1 100644
--- a/src/libs/utils/dropsupport.cpp
+++ b/src/libs/utils/dropsupport.cpp
@@ -10,7 +10,7 @@
 #include <QDropEvent>
 #include <QTimer>
 
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
 // for file drops from Finder, working around QTBUG-40449
 #include "fileutils_mac.h"
 #endif
diff --git a/src/libs/utils/processhandle.cpp b/src/libs/utils/processhandle.cpp
index 06850457d37..c27e8a70db6 100644
--- a/src/libs/utils/processhandle.cpp
+++ b/src/libs/utils/processhandle.cpp
@@ -47,7 +47,7 @@ bool ProcessHandle::equals(const ProcessHandle &rhs) const
     return m_pid == rhs.m_pid;
 }
 
-#ifndef Q_OS_OSX
+#ifndef Q_OS_MACOS
 bool ProcessHandle::activate()
 {
     return false;
diff --git a/src/plugins/coreplugin/windowsupport.cpp b/src/plugins/coreplugin/windowsupport.cpp
index fd80fe23181..220df7fe5bc 100644
--- a/src/plugins/coreplugin/windowsupport.cpp
+++ b/src/plugins/coreplugin/windowsupport.cpp
@@ -146,7 +146,7 @@ WindowList::~WindowList()
 
 void WindowList::addWindow(QWidget *window)
 {
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
     if (!m_dockMenu) {
         m_dockMenu = new QMenu;
         m_dockMenu->setAsDockMenu();
diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
index f3618841c8d..abf5bd5c068 100644
--- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
+++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
@@ -33,7 +33,7 @@ static QJsonObject metaData(const QString &fileName)
 
 static QString libraryName(const QString &basename)
 {
-#if defined(Q_OS_OSX)
+#if defined(Q_OS_MACOS)
     return QLatin1String("lib") + basename + QLatin1String("_debug.dylib");
 #elif defined(Q_OS_UNIX)
     return QLatin1String("lib") + basename + QLatin1String(".so");