diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-07-01 08:38:19 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-07-01 08:04:47 +0000 |
| commit | 5d00208c1c1b1563e8b52c4f18a69ab66d0da724 (patch) | |
| tree | 246ef0b542233dc503d6c7734ca379bde960a5c9 /src/designer/src/designer/qdesigner_actions.cpp | |
| parent | ee5f6e2384872bb140fc6d376599640ff9f8a2b3 (diff) | |
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>
Diffstat (limited to 'src/designer/src/designer/qdesigner_actions.cpp')
| -rw-r--r-- | src/designer/src/designer/qdesigner_actions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 |