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>

src/plugins/help/externalhelpwindow.cpp

@@ -145,7 +145,7 @@ ExternalHelpWindow::ExternalHelpWindow(QWidget *parent)
         tr("Show Sidebar"), this);
     connect(action, SIGNAL(triggered()), this, SIGNAL(showHideSidebar()));
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     reset->setShortcut(QKeySequence(Qt::ALT + Qt::Key_0));
     action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0));
     ctrlTab->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Tab));

src/plugins/help/helpplugin.cpp

@@ -247,7 +247,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
     cmd->setDefaultKeySequence(QKeySequence(Qt::Key_F1));
     connect(action, SIGNAL(triggered()), this, SLOT(activateContext()));
 
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
     action = new QAction(this);
     action->setSeparator(true);
     cmd = am->registerAction(action, Core::Id("Help.Separator"), globalcontext);
@@ -264,7 +264,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
     am->actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
     connect(action, SIGNAL(triggered()), this, SLOT(slotReportBug()));
 
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
     action = new QAction(this);
     action->setSeparator(true);
     cmd = am->registerAction(action, Core::Id("Help.Separator2"), globalcontext);

src/plugins/help/openpagesswitcher.cpp

@@ -56,7 +56,7 @@ OpenPagesSwitcher::OpenPagesSwitcher(OpenPagesModel *model)
 
     // We disable the frame on this list view and use a QFrame around it instead.
     // This improves the look with QGTKStyle.
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
     setFrameStyle(m_openPagesWidget->frameStyle());
 #endif
     m_openPagesWidget->setFrameStyle(QFrame::NoFrame);
@@ -127,7 +127,7 @@ bool OpenPagesSwitcher::eventFilter(QObject *object, QEvent *event)
                 emit setCurrentPage(m_openPagesWidget->currentIndex());
                 return true;
             }
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
             const Qt::KeyboardModifier modifier = Qt::AltModifier;
 #else
             const Qt::KeyboardModifier modifier = Qt::ControlModifier;

src/plugins/help/openpageswidget.cpp

@@ -45,7 +45,7 @@
 #include <QtGui/QMouseEvent>
 #include <QtGui/QMenu>
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 #include <qmacstyle_mac.h>
 #endif