summaryrefslogtreecommitdiff
path: root/src/libs/qmleditorwidgets
diff options
context:
space:
mode:
authorMorten Johan Sorvig <morten.sorvig@nokia.com>2012-01-25 10:25:05 +0100
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2012-01-26 11:06:12 +0100
commitb0cd54c1ec9e30a32483065e6c0fcb53a1888e81 (patch)
treed080ed0bb3435f4eab3d0147ebaaaa4e9e0bfee1 /src/libs/qmleditorwidgets
parent896a7a65e445fb92b589e3334302fb44308e33e2 (diff)
downloadqt-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/libs/qmleditorwidgets')
-rw-r--r--src/libs/qmleditorwidgets/contextpanewidget.cpp6
-rw-r--r--src/libs/qmleditorwidgets/customcolordialog.cpp4
2 files changed, 5 insertions, 5 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
}