feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Replace Q_OS_OSX with Q_OS_MACOS

Browse Source 
Change-Id: Ibee0c259d7df86a8df58b1ad12549b145f715397
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tor Arne Vestbø
2023-06-07 02:10:07 +02:00
parent c65c71c4e3
commit 27b630c3ab
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/qmlpuppetcommunication/container/sharedmemory_unix.cpp
View File

@@ -15,7 +15,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef Q_OS_OSX #ifdef Q_OS_MACOS
#include <sys/posix_shm.h> #include <sys/posix_shm.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
@@ -326,7 +326,7 @@ bool SharedMemory::createInternal(QSharedMemory::AccessMode mode, size_t size)
{ {
detachInternal(); detachInternal();
#ifdef Q_OS_OSX #ifdef Q_OS_MACOS
if (m_fileHandle > -1 && m_createdByMe) { if (m_fileHandle > -1 && m_createdByMe) {
close(m_fileHandle); close(m_fileHandle);
shm_unlink(m_nativeKey.constData()); shm_unlink(m_nativeKey.constData());

2
src/libs/utils/dropsupport.cpp
View File

@@ -10,7 +10,7 @@
#include <QDropEvent> #include <QDropEvent>
#include <QTimer> #include <QTimer>
#ifdef Q_OS_OSX #ifdef Q_OS_MACOS
// for file drops from Finder, working around QTBUG-40449 // for file drops from Finder, working around QTBUG-40449
#include "fileutils_mac.h" #include "fileutils_mac.h"
#endif #endif

2
src/libs/utils/processhandle.cpp
View File

@@ -47,7 +47,7 @@ bool ProcessHandle::equals(const ProcessHandle &rhs) const
return m_pid == rhs.m_pid; return m_pid == rhs.m_pid;
} }
#ifndef Q_OS_OSX #ifndef Q_OS_MACOS
bool ProcessHandle::activate() bool ProcessHandle::activate()
{ {
return false; return false;

2
src/plugins/coreplugin/windowsupport.cpp
View File

@@ -146,7 +146,7 @@ WindowList::~WindowList()
void WindowList::addWindow(QWidget *window) void WindowList::addWindow(QWidget *window)
{ {
#ifdef Q_OS_OSX #ifdef Q_OS_MACOS
if (!m_dockMenu) { if (!m_dockMenu) {
m_dockMenu = new QMenu; m_dockMenu = new QMenu;
m_dockMenu->setAsDockMenu(); m_dockMenu->setAsDockMenu();

2
tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
View File

@@ -33,7 +33,7 @@ static QJsonObject metaData(const QString &fileName)
static QString libraryName(const QString &basename) static QString libraryName(const QString &basename)
{ {
#if defined(Q_OS_OSX) #if defined(Q_OS_MACOS)
return QLatin1String("lib") + basename + QLatin1String("_debug.dylib"); return QLatin1String("lib") + basename + QLatin1String("_debug.dylib");
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
return QLatin1String("lib") + basename + QLatin1String(".so"); return QLatin1String("lib") + basename + QLatin1String(".so");