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/libs/utils/detailswidget.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/libs/utils/detailswidget.cpp')
| -rw-r--r-- | src/libs/utils/detailswidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |