diff options
author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-12-03 14:34:05 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-03 17:02:29 +0100 |
commit | 568c575b97940e6afa5015ef2566d8316aa22cd8 (patch) | |
tree | 054996046bc61e37057d21ed0f9b3ff663e3a5e9 | |
parent | ad03627d142dd002c2c3505f7d75f4c7453cd9a1 (diff) |
Revert "Load "@2x" images on high-dpi "retina" systems."
This reverts commit 707bbe5dea9d7398b205124a54422f2fafb6f151.
By itself this is completely broken and the image will
display at twice the size. We need to add code to handle
the @2x image but revert for now to get sane behavior.
Change-Id: Iccdb26e9d19930b5d0ef4b6c7f596c5766f77a8a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
-rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index 26258fdc5f..082d640ab9 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -1033,17 +1033,6 @@ static QQuickPixmapData* createPixmapDataSync(QQuickPixmap *declarativePixmap, Q if (localFile.isEmpty()) return 0; - // check for "retina" high-dpi and use @2x file if it exixts - if (qApp->devicePixelRatio() > 1) { - const int dotIndex = localFile.lastIndexOf(QLatin1Char('.')); - if (dotIndex != -1) { - QString retinaFile = localFile; - retinaFile.insert(dotIndex, QStringLiteral("@2x")); - if (QFile(retinaFile).exists()) - localFile = retinaFile; - } - } - QFile f(localFile); QSize readSize; QString errorString; |