AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Q_DEAD_CODE_FROM_QT4_MAC sections

Browse Source 
Change-Id: I483446c9eac8aa617b94e54f1e61f77a4eba7683
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
This commit is contained in:
Morten Johan Sørvig 2015-01-12 13:43:19 +01:00 committed by Morten Johan Sørvig
parent ba89cbc101
commit 03546e2e89
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/image/qiconloader.cpp
View File

@ -46,10 +46,6 @@
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtGui/QPainter> #include <QtGui/QPainter>
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#include <private/qt_cocoa_helpers_mac_p.h>
#endif
#include <private/qhexstring_p.h> #include <private/qhexstring_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -397,9 +393,6 @@ void QIconLoaderEngine::paint(QPainter *painter, const QRect &rect,
QIcon::Mode mode, QIcon::State state) QIcon::Mode mode, QIcon::State state)
{ {
QSize pixmapSize = rect.size(); QSize pixmapSize = rect.size();
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
pixmapSize *= qt_mac_get_scalefactor();
#endif
painter->drawPixmap(rect, pixmap(pixmapSize, mode, state)); painter->drawPixmap(rect, pixmap(pixmapSize, mode, state));
} }