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/coreplugin/fancyactionbar.cpp | |
| parent | 896a7a65e445fb92b589e3334302fb44308e33e2 (diff) | |
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/coreplugin/fancyactionbar.cpp')
| -rw-r--r-- | src/plugins/coreplugin/fancyactionbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp index 68dfc50250..9bfbf0faac 100644 --- a/src/plugins/coreplugin/fancyactionbar.cpp +++ b/src/plugins/coreplugin/fancyactionbar.cpp @@ -148,7 +148,7 @@ void FancyToolButton::paintEvent(QPaintEvent *event) // draw borders bool isTitledAction = defaultAction()->property("titledAction").toBool(); -#ifndef Q_WS_MAC // Mac UIs usually don't hover +#ifndef Q_OS_MAC // Mac UIs usually don't hover if (m_fader > 0 && isEnabled() && !isDown() && !isChecked()) { painter.save(); int fader = int(40 * m_fader); |