forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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());
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user