9 files changed, 18 insertions, 18 deletions
diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp
index eb0fb47a68..a65cdde7a2 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp
@@ -171,14 +171,14 @@ void DragWidget::protectedMoved()
 
 void DragWidget::leaveEvent(QEvent *)
 {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     unsetCursor();
 #endif
 }
 
 void DragWidget::enterEvent(QEvent *)
 {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     setCursor(Qt::ArrowCursor);
 #endif
 }
@@ -226,7 +226,7 @@ ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_cu
     m_disableAction->setCheckable(true);
     connect(m_disableAction.data(), SIGNAL(toggled(bool)), this, SLOT(onDisable(bool)));
     m_pinned = false;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     setCursor(Qt::ArrowCursor);
 #endif
 }
diff --git a/src/libs/qmleditorwidgets/customcolordialog.cpp b/src/libs/qmleditorwidgets/customcolordialog.cpp
index e6dc53c1b4..7c4df3b43a 100644
--- a/src/libs/qmleditorwidgets/customcolordialog.cpp
+++ b/src/libs/qmleditorwidgets/customcolordialog.cpp
@@ -182,14 +182,14 @@ void CustomColorDialog::setupWidgets()
 
 void CustomColorDialog::leaveEvent(QEvent *)
 {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     unsetCursor();
 #endif
 }
 
 void CustomColorDialog::enterEvent(QEvent *)
 {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     setCursor(Qt::ArrowCursor);
 #endif
 }
diff --git a/src/libs/qtcomponents/styleitem/qstyleitem.cpp b/src/libs/qtcomponents/styleitem/qstyleitem.cpp
index 466f983f76..dc580d5b9b 100644
--- a/src/libs/qtcomponents/styleitem/qstyleitem.cpp
+++ b/src/libs/qtcomponents/styleitem/qstyleitem.cpp
@@ -562,7 +562,7 @@ QSize QStyleItem::sizeFromContents(int width, int height)
         break;
     case Header:
         size = qApp->style()->sizeFromContents(QStyle::CT_HeaderSection, m_styleoption, QSize(width,height), widget());
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
         if (style() =="mac")
             size.setHeight(15);
 #endif
@@ -575,7 +575,7 @@ QSize QStyleItem::sizeFromContents(int width, int height)
         break;
     }
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     // ### hack - With even heights, the text baseline is off on mac
     if (size.height() %2 == 0)
         size.setHeight(size.height() + 1);
@@ -738,7 +738,7 @@ void QStyleItem::setElementType(const QString &str)
         // Gtk uses qobject cast, hence we need to separate this from menuitem
         // On mac, we temporarily use the menu item because it has more accurate
         // palette.
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
         static QMenu *combo = new QMenu();
 #else
         static QComboBox *combo = new QComboBox();
@@ -826,7 +826,7 @@ void QStyleItem::setElementType(const QString &str)
         m_dummywidget->setAttribute(Qt::WA_QuitOnClose, false); // dont keep app open
         m_dummywidget->setAttribute(Qt::WA_LayoutUsesWidgetRect);
         m_dummywidget->winId();
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
         m_dummywidget->setGeometry(-1000, 0, 10,10);
         m_dummywidget->setVisible(visible); // Mac require us to set the visibility before this
 #endif
diff --git a/src/libs/utils/detailsbutton.cpp b/src/libs/utils/detailsbutton.cpp
index e3b3c5becb..61d04a6111 100644
--- a/src/libs/utils/detailsbutton.cpp
+++ b/src/libs/utils/detailsbutton.cpp
@@ -81,7 +81,7 @@ QSize DetailsButton::sizeHint() const
 {
     // TODO: Adjust this when icons become available!
     const int w = fontMetrics().width(text()) + 32;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     return QSize(w, 34);
 #else
     return QSize(w, 22);
@@ -118,7 +118,7 @@ void DetailsButton::paintEvent(QPaintEvent *e)
     QWidget::paintEvent(e);
 
     QPainter p(this);
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
     // draw hover animation
     if (!isDown() && m_fader > 0)
         p.fillRect(rect().adjusted(1, 1, -2, -2), QColor(255, 255, 255, int(m_fader*180)));
diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp
index 97f8bdb5f0..dccca17f52 100644
--- a/src/libs/utils/detailswidget.cpp
+++ b/src/libs/utils/detailswidget.cpp
@@ -145,7 +145,7 @@ QPixmap DetailsWidgetPrivate::cacheBackground(const QSize &size, bool expanded)
 
     QRect topRect(0, 0, size.width(), topHeight);
     QRect fullRect(0, 0, size.width(), size.height());
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     p.fillRect(fullRect, qApp->palette().window().color());
 #endif
     p.fillRect(fullRect, QColor(255, 255, 255, 40));
@@ -378,7 +378,7 @@ void DetailsWidget::setToolWidget(Utils::FadingPanel *widget)
     d->m_toolWidget->adjustSize();
     d->m_grid->addWidget(d->m_toolWidget, 0, 1, 1, 1, Qt::AlignRight);
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     d->m_toolWidget->setOpacity(1.0);
 #endif
     d->changeHoverState(d->m_hovered);
diff --git a/src/libs/utils/navigationtreeview.cpp b/src/libs/utils/navigationtreeview.cpp
index 48ebd7d139..e649c2d969 100644
--- a/src/libs/utils/navigationtreeview.cpp
+++ b/src/libs/utils/navigationtreeview.cpp
@@ -35,7 +35,7 @@
 #include <QtGui/QHeaderView>
 #include <QtGui/QFocusEvent>
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 #include <QtGui/QKeyEvent>
 #endif
 
@@ -87,7 +87,7 @@ void NavigationTreeView::resizeEvent(QResizeEvent *event)
     QTreeView::resizeEvent(event);
 }
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 void NavigationTreeView::keyPressEvent(QKeyEvent *event)
 {
     if ((event->key() == Qt::Key_Return
diff --git a/src/libs/utils/navigationtreeview.h b/src/libs/utils/navigationtreeview.h
index 9422a61164..189fa0d6ab 100644
--- a/src/libs/utils/navigationtreeview.h
+++ b/src/libs/utils/navigationtreeview.h
@@ -50,7 +50,7 @@ protected:
     void focusOutEvent(QFocusEvent *event);
     void resizeEvent(QResizeEvent *event);
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     void keyPressEvent(QKeyEvent *event);
 #endif
 };
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 20e3d07188..d3cefb2801 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -61,7 +61,7 @@
 */
 
 /*static*/ const char * const Utils::PathChooser::browseButtonLabel =
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
                    QT_TRANSLATE_NOOP("Utils::PathChooser", "Choose...");
 #else
                    QT_TRANSLATE_NOOP("Utils::PathChooser", "Browse...");
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index d46b2762f8..0905781d18 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -71,7 +71,7 @@ QColor StyleHelper::mergedColors(const QColor &colorA, const QColor &colorB, int
 
 qreal StyleHelper::sidebarFontSize()
 {
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     return 10;
 #else
     return 7.5;