diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-29 13:18:41 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-09-08 10:33:25 +0200 |
commit | 847f10e9ccc8c3541782a790e04c85c6b4c701da (patch) | |
tree | e59ebac8dfb77c88d8e5540855836ca79a9a7a91 /src/libs/utils/stylehelper.cpp | |
parent | 6f58e5b798e368e6254cc837e489bd8fd8f066e9 (diff) |
Remove Qt version checks.
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.
Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/libs/utils/stylehelper.cpp')
-rw-r--r-- | src/libs/utils/stylehelper.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp index 58c9405af2f..ac4061a234c 100644 --- a/src/libs/utils/stylehelper.cpp +++ b/src/libs/utils/stylehelper.cpp @@ -349,16 +349,6 @@ void StyleHelper::menuGradient(QPainter *painter, const QRect &spanRect, const Q } } -static qreal pixmapDevicePixelRatio(const QPixmap &pixmap) -{ -#if QT_VERSION > 0x050000 - return pixmap.devicePixelRatio(); -#else - Q_UNUSED(pixmap); - return 1.0; -#endif -} - // Draws a cached pixmap with shadow void StyleHelper::drawIconWithShadow(const QIcon &icon, const QRect &rect, QPainter *p, QIcon::Mode iconMode, int dipRadius, const QColor &color, const QPoint &dipOffset) @@ -373,7 +363,7 @@ void StyleHelper::drawIconWithShadow(const QIcon &icon, const QRect &rect, // different than 1. The shadow drawing caluculations are done in device // pixels. QPixmap px = icon.pixmap(rect.size()); - int devicePixelRatio = qCeil(pixmapDevicePixelRatio(px)); + int devicePixelRatio = qCeil(px.devicePixelRatio()); int radius = dipRadius * devicePixelRatio; QPoint offset = dipOffset * devicePixelRatio; cache = QPixmap(px.size() + QSize(radius * 2, radius * 2)); @@ -428,14 +418,12 @@ void StyleHelper::drawIconWithShadow(const QIcon &icon, const QRect &rect, // Draw the actual pixmap... cachePainter.drawPixmap(QRect(QPoint(radius, radius) + offset, QSize(px.width(), px.height())), px); -#if QT_VERSION > 0x050000 cache.setDevicePixelRatio(devicePixelRatio); -#endif QPixmapCache::insert(pixmapName, cache); } QRect targetRect = cache.rect(); - targetRect.setSize(targetRect.size() / pixmapDevicePixelRatio(cache)); + targetRect.setSize(targetRect.size() / cache.devicePixelRatio()); targetRect.moveCenter(rect.center() - dipOffset); p->drawPixmap(targetRect, cache); } |