diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2015-02-02 18:49:18 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-02-03 11:49:14 +0000 |
| commit | c5db8fc74a9d437a4e7c0af077aed7c1f1bd4e26 (patch) | |
| tree | f7d42e0be35dd0ed85e74eaecdbbad4f319bc1d1 /src/gui/image | |
| parent | 611bcc3cd337fe77ea5d3b898d897582da6f7ee2 (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/gui/image')
| -rw-r--r-- | src/gui/image/qicon.cpp | 2 | ||||
| -rw-r--r-- | src/gui/image/qiconloader.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 1b99a5d8dc..5cd9894c4c 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -46,7 +46,7 @@ #include "qdebug.h" #include "qpalette.h" -#ifdef Q_WS_MAC +#ifdef Q_DEAD_CODE_FROM_QT4_MAC #include <private/qt_mac_p.h> #include <private/qt_cocoa_helpers_mac_p.h> #endif diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 4510125816..c7a08a7938 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -47,7 +47,7 @@ #include <QtCore/QSettings> #include <QtGui/QPainter> -#ifdef Q_WS_MAC +#ifdef Q_DEAD_CODE_FROM_QT4_MAC #include <private/qt_cocoa_helpers_mac_p.h> #endif @@ -398,7 +398,7 @@ void QIconLoaderEngine::paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) { QSize pixmapSize = rect.size(); -#if defined(Q_WS_MAC) +#if defined(Q_DEAD_CODE_FROM_QT4_MAC) pixmapSize *= qt_mac_get_scalefactor(); #endif painter->drawPixmap(rect, pixmap(pixmapSize, mode, state)); |