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 #include -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS #include #endif #include @@ -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 #include -#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");