Qt Designer: Use Q_OS_MACOS macro instead of Q_OS_MAC

Q_OS_MACOS was introduced by qtbase
3e2bde35786f503c9031c34454b741a02426bb9a.

Change-Id: I2d780a4ffc43ec216014f541e36a9c118817207d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

15 files changed, 23 insertions, 23 deletions

diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index 208dd007a..651596634 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -537,7 +537,7 @@ static inline unsigned mouseFlags(Qt::KeyboardModifiers mod)
     case Qt::ShiftModifier:
         return CycleParentModifier;
         break;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     case Qt::AltModifier: // "Alt" or "option" key on Mac means copy
         return CopyDragModifier;
 #endif
diff --git a/src/designer/src/designer/assistantclient.cpp b/src/designer/src/designer/assistantclient.cpp
index 003c03baf..54797c2ef 100644
--- a/src/designer/src/designer/assistantclient.cpp
+++ b/src/designer/src/designer/assistantclient.cpp
@@ -105,7 +105,7 @@ bool AssistantClient::isRunning() const
 QString AssistantClient::binary()
 {
     QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
-#if !defined(Q_OS_MAC)
+#if !defined(Q_OS_MACOS)
     app += QStringLiteral("assistant");
 #else
     app += QStringLiteral("Assistant.app/Contents/MacOS/Assistant");
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index 02e4c3d33..69e8b35e1 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -87,7 +87,7 @@ MainWindowBase::MainWindowBase(QWidget *parent, Qt::WindowFlags flags) :
     QMainWindow(parent, flags),
     m_policy(AcceptCloseEvents)
 {
-#ifndef Q_OS_MAC
+#ifndef Q_OS_MACOS
     setWindowIcon(qDesigner->windowIcon());
 #endif
 }
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp
index 5e6a3db9c..217f904f5 100644
--- a/src/designer/src/designer/qdesigner.cpp
+++ b/src/designer/src/designer/qdesigner.cpp
@@ -88,7 +88,7 @@ QDesigner::QDesigner(int &argc, char **argv)
     setApplicationName(QLatin1String(designerApplicationName));
     QDesignerComponents::initializeResources();
 
-#ifndef Q_OS_MAC
+#ifndef Q_OS_MACOS
     setWindowIcon(QIcon(QStringLiteral(":/qt-project.org/designer/images/designer.png")));
 #endif
 }
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index 242e7ec9e..27475ddf6 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -102,7 +102,7 @@ using namespace qdesigner_internal;
 
 const char *QDesignerActions::defaultToolbarPropertyName = "__qt_defaultToolBarAction";
 
-//#ifdef Q_OS_MAC
+//#ifdef Q_OS_MACOS
 #  define NONMODAL_PREVIEW
 //#endif
 
@@ -197,7 +197,7 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench)
 {
     typedef void (QDesignerActions::*VoidSlot)();
 
-#if defined (Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined (Q_OS_UNIX) && !defined(Q_OS_MACOS)
     m_newFormAction->setIcon(QIcon::fromTheme(QStringLiteral("document-new"), m_newFormAction->icon()));
     m_openFormAction->setIcon(QIcon::fromTheme(QStringLiteral("document-open"), m_openFormAction->icon()));
     m_saveFormAction->setIcon(QIcon::fromTheme(QStringLiteral("document-save"), m_saveFormAction->icon()));
@@ -261,7 +261,7 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench)
     connect(m_saveFormAsAction, &QAction::triggered, this, static_cast<VoidSlot>(&QDesignerActions::saveFormAs));
     m_fileActions->addAction(m_saveFormAsAction);
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     m_saveAllFormsAction->setShortcut(tr("ALT+CTRL+S"));
 #else
     m_saveAllFormsAction->setShortcut(tr("CTRL+SHIFT+S")); // Commonly "Save As" on Mac
diff --git a/src/designer/src/designer/qdesigner_settings.cpp b/src/designer/src/designer/qdesigner_settings.cpp
index 91ffede4b..ab6b48238 100644
--- a/src/designer/src/designer/qdesigner_settings.cpp
+++ b/src/designer/src/designer/qdesigner_settings.cpp
@@ -209,7 +209,7 @@ void QDesignerSettings::setUiMode(UIMode mode)
 
 UIMode QDesignerSettings::uiMode() const
 {
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     const UIMode defaultMode = TopLevelMode;
 #else
     const UIMode defaultMode = DockedMode;
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index aa2de9103..d54d48a71 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -327,7 +327,7 @@ Qt::WindowFlags QDesignerWorkbench::magicalWindowFlags(const QWidget *widgetForF
 {
     switch (m_mode) {
         case TopLevelMode: {
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
             if (qobject_cast<const QDesignerToolWindow *>(widgetForFlags))
                 return Qt::Tool;
 #else
@@ -389,7 +389,7 @@ void QDesignerWorkbench::switchToNeutralMode()
         fw->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
     }
 
-#ifndef Q_OS_MAC
+#ifndef Q_OS_MACOS
     m_globalMenuBar->setParent(0);
 #endif
 
@@ -407,14 +407,14 @@ void QDesignerWorkbench::switchToDockedMode()
 
     switchToNeutralMode();
 
-#if !defined(Q_OS_MAC)
+#if !defined(Q_OS_MACOS)
 #    if defined(Q_OS_UNIX)
     QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, false);
 #    endif // Q_OS_UNIX
     QDesignerToolWindow *widgetBoxWrapper = widgetBoxToolWindow();
     widgetBoxWrapper->action()->setVisible(true);
     widgetBoxWrapper->setWindowTitle(tr("Widget Box"));
-#endif // !Q_OS_MAC
+#endif // !Q_OS_MACOS
 
     m_mode = DockedMode;
     const QDesignerSettings settings(m_core);
@@ -431,7 +431,7 @@ void QDesignerWorkbench::switchToDockedMode()
 
     m_core->setTopLevel(m_dockedMainWindow);
 
-#ifndef Q_OS_MAC
+#ifndef Q_OS_MACOS
     m_dockedMainWindow->setMenuBar(m_globalMenuBar);
     m_globalMenuBar->show();
 #endif
@@ -480,7 +480,7 @@ void QDesignerWorkbench::switchToTopLevelMode()
     // The widget box is special, it gets the menubar and gets to be the main widget.
 
     m_core->setTopLevel(widgetBoxWrapper);
-#if !defined(Q_OS_MAC)
+#if !defined(Q_OS_MACOS)
 #    if defined(Q_OS_UNIX)
     // For now the appmenu protocol does not make it possible to associate a
     // menubar with all application windows. This means in top level mode you
@@ -494,7 +494,7 @@ void QDesignerWorkbench::switchToTopLevelMode()
     widgetBoxWrapper->setCloseEventPolicy(MainWindowBase::EmitCloseEventSignal);
     qDesigner->setMainWindow(widgetBoxWrapper);
     widgetBoxWrapper->setWindowTitle(MainWindowBase::mainWindowTitle());
-#endif // !Q_OS_MAC
+#endif // !Q_OS_MACOS
 
     const QDesignerSettings settings(m_core);
     m_topLevelData.toolbars = MainWindowBase::createToolBars(m_actionManager, false);
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp
index d91c16cb0..26f68b960 100644
--- a/src/designer/src/designer/versiondialog.cpp
+++ b/src/designer/src/designer/versiondialog.cpp
@@ -150,7 +150,7 @@ void VersionLabel::paintEvent(QPaintEvent *pe)
 
 VersionDialog::VersionDialog(QWidget *parent)
     : QDialog(parent
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
             , Qt::Tool
 #endif
             )
diff --git a/src/designer/src/lib/sdk/abstractformeditor.cpp b/src/designer/src/lib/sdk/abstractformeditor.cpp
index 9106d5437..db76d31aa 100644
--- a/src/designer/src/lib/sdk/abstractformeditor.cpp
+++ b/src/designer/src/lib/sdk/abstractformeditor.cpp
@@ -551,7 +551,7 @@ void QDesignerFormEditorInterface::setIntrospection(QDesignerIntrospectionInterf
 */
 QString QDesignerFormEditorInterface::resourceLocation() const
 {
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     return QStringLiteral(":/qt-project.org/formeditor/images/mac");
 #else
     return QStringLiteral(":/qt-project.org/formeditor/images/win");
diff --git a/src/designer/src/lib/shared/dialoggui.cpp b/src/designer/src/lib/shared/dialoggui.cpp
index dcda33eb1..d63d611ca 100644
--- a/src/designer/src/lib/shared/dialoggui.cpp
+++ b/src/designer/src/lib/shared/dialoggui.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/QSet>
 
 // QFileDialog on X11 does not provide an image preview. Display icons.
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
 #  define IMAGE_PREVIEW
 #endif
 
diff --git a/src/designer/src/lib/shared/iconloader.cpp b/src/designer/src/lib/shared/iconloader.cpp
index c5ae922c7..5259d93cc 100644
--- a/src/designer/src/lib/shared/iconloader.cpp
+++ b/src/designer/src/lib/shared/iconloader.cpp
@@ -45,7 +45,7 @@ QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name)
 {
     QStringList candidates = QStringList()
         << (QString::fromUtf8(":/qt-project.org/formeditor/images/") + name)
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
         << (QString::fromUtf8(":/qt-project.org/formeditor/images/mac/") + name)
 #else
         << (QString::fromUtf8(":/qt-project.org/formeditor/images/win/") + name)
diff --git a/src/designer/src/lib/shared/plugindialog.cpp b/src/designer/src/lib/shared/plugindialog.cpp
index 40f35b27a..8102aa872 100644
--- a/src/designer/src/lib/shared/plugindialog.cpp
+++ b/src/designer/src/lib/shared/plugindialog.cpp
@@ -53,7 +53,7 @@ namespace qdesigner_internal {
 
 PluginDialog::PluginDialog(QDesignerFormEditorInterface *core, QWidget *parent)
     : QDialog(parent
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
             , Qt::Tool
 #endif
             ), m_core(core)
diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index 12bab9ff7..8485a59ec 100644
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -872,7 +872,7 @@ bool PreviewManager::eventFilter(QObject *watched, QEvent *event)
             const  QKeyEvent *keyEvent = static_cast<const QKeyEvent *>(event);
             const int key = keyEvent->key();
             if ((key == Qt::Key_Escape
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
                  || (keyEvent->modifiers() == Qt::ControlModifier && key == Qt::Key_Period)
 #endif
                  )) {
diff --git a/src/designer/src/lib/shared/sheet_delegate.cpp b/src/designer/src/lib/shared/sheet_delegate.cpp
index da64f3bf5..25390b507 100644
--- a/src/designer/src/lib/shared/sheet_delegate.cpp
+++ b/src/designer/src/lib/shared/sheet_delegate.cpp
@@ -58,7 +58,7 @@ void SheetDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
         QStyleOptionButton buttonOption;
 
         buttonOption.state = option.state;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
         buttonOption.state |= QStyle::State_Raised;
 #endif
         buttonOption.state &= ~QStyle::State_HasFocus;
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index aea69046a..c0861e3d5 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -655,7 +655,7 @@ void QAbstractFormBuilder::layoutInfo(DomLayout *ui_layout, QObject *parent, int
     if (const DomProperty *p = properties.value(strings.spacingProperty, 0))
         spac = p->elementNumber();
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     // here we recognize UI file < 4.3 (no we don't store margin property)
     if (mar != INT_MIN) {
         const int defaultMargin = parent->inherits("QLayoutWidget") ? 0 : 9;