summaryrefslogtreecommitdiffstats
path: root/src/plugins/styles/bb10style
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2015-02-02 18:49:18 +0100
committerTor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>2015-02-03 11:49:14 +0000
commitc5db8fc74a9d437a4e7c0af077aed7c1f1bd4e26 (patch)
treef7d42e0be35dd0ed85e74eaecdbbad4f319bc1d1 /src/plugins/styles/bb10style
parent611bcc3cd337fe77ea5d3b898d897582da6f7ee2 (diff)
Make it more obvious that Q_WS_ is dead code, and should perhaps be ported
We still have a bunch of Q_WS_ ifdefs in our code, which are easy to mistake for Q_OS_ ifdefs when quickly scanning the code. By renaming the ifdefs we make it clear that the code in question is dead. In incremental follow-ups, we can then selectively either remove, or port, the pieces that are dead code. Change-Id: Ib5ef3e9e0662d321f179f3e25122cacafff0f41f Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/plugins/styles/bb10style')
-rw-r--r--src/plugins/styles/bb10style/qpixmapstyle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/styles/bb10style/qpixmapstyle.cpp b/src/plugins/styles/bb10style/qpixmapstyle.cpp
index e80a1d991c..539b892e65 100644
--- a/src/plugins/styles/bb10style/qpixmapstyle.cpp
+++ b/src/plugins/styles/bb10style/qpixmapstyle.cpp
@@ -75,7 +75,7 @@ QPixmapStyle::~QPixmapStyle()
void QPixmapStyle::polish(QApplication *application)
{
QCommonStyle::polish(application);
-#if defined(Q_WS_WIN)
+#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
QApplication::setEffectEnabled(Qt::UI_AnimateCombo, false);
#endif
}
@@ -129,7 +129,7 @@ void QPixmapStyle::polish(QWidget *widget)
frame->setContentsMargins(pix.margins.left(), desc.margins.top(),
pix.margins.right(), desc.margins.bottom());
frame->setAttribute(Qt::WA_TranslucentBackground);
-#ifdef Q_WS_WIN
+#ifdef Q_DEAD_CODE_FROM_QT4_WIN
// FramelessWindowHint is needed on windows to make
// WA_TranslucentBackground work properly
frame->setWindowFlags(widget->windowFlags() | Qt::FramelessWindowHint);