diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-01-25 10:25:05 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2012-01-26 11:06:12 +0100 |
| commit | b0cd54c1ec9e30a32483065e6c0fcb53a1888e81 (patch) | |
| tree | d080ed0bb3435f4eab3d0147ebaaaa4e9e0bfee1 /src/plugins/bookmarks | |
| parent | 896a7a65e445fb92b589e3334302fb44308e33e2 (diff) | |
| download | qt-creator-b0cd54c1ec9e30a32483065e6c0fcb53a1888e81.tar.gz | |
Replace Q_WS_MAC with Q_OS_MAC.
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.
This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)
Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/bookmarks')
| -rw-r--r-- | src/plugins/bookmarks/bookmarksplugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp index b3e3d3a2d7..c4c1446786 100644 --- a/src/plugins/bookmarks/bookmarksplugin.cpp +++ b/src/plugins/bookmarks/bookmarksplugin.cpp @@ -83,7 +83,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *) m_toggleAction = new QAction(tr("Toggle Bookmark"), this); Core::Command *cmd = am->registerAction(m_toggleAction, BOOKMARKS_TOGGLE_ACTION, textcontext); -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+M"))); #else cmd->setDefaultKeySequence(QKeySequence(tr("Meta+M"))); @@ -98,7 +98,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *) //Previous m_prevAction = new QAction(tr("Previous Bookmark"), this); cmd = am->registerAction(m_prevAction, BOOKMARKS_PREV_ACTION, globalcontext); -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+,"))); #else cmd->setDefaultKeySequence(QKeySequence(tr("Meta+,"))); @@ -108,7 +108,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *) //Next m_nextAction = new QAction(tr("Next Bookmark"), this); cmd = am->registerAction(m_nextAction, BOOKMARKS_NEXT_ACTION, globalcontext); -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+."))); #else cmd->setDefaultKeySequence(QKeySequence(tr("Meta+."))); |