From 2dc46c09026362cc267b1183faf09fb29479ef93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sat, 29 Aug 2020 22:28:34 +0200 Subject: Deprecate and remove all uses of AA_UseHighDpiPixmaps High-DPI pixmaps are always enabled, and cannot be disabled. Change-Id: I01a006b404e5431582b64ef812974c1c022b39ae Reviewed-by: Volker Hilsheimer --- tests/manual/highdpi/main.cpp | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'tests/manual/highdpi') diff --git a/tests/manual/highdpi/main.cpp b/tests/manual/highdpi/main.cpp index 4d70198d29..95036d881f 100644 --- a/tests/manual/highdpi/main.cpp +++ b/tests/manual/highdpi/main.cpp @@ -749,9 +749,6 @@ public: int maxSize = 64; int sizeIncrement = 5; - // Disable high-dpi icons - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, false); - // normal icon for (int size = minSize; size < maxSize; size += sizeIncrement) { QPainter p(this); @@ -771,36 +768,6 @@ public: y+=dy; x = ((x + dx) % maxX); } - - x = 10; - y+=dy; - - // Enable high-dpi icons - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); - - // normal icon - for (int size = minSize; size < maxSize; size += sizeIncrement) { - QPainter p(this); - p.drawPixmap(x, y, iconNormalDpi->pixmap(size, size)); - if (x + dx > maxX) - y+=dy; - x = ((x + dx) % maxX); - } - x = 10; - y+=dy; - - // high-dpi icon (draw point) - for (int size = minSize; size < maxSize; size += sizeIncrement) { - QPainter p(this); - p.drawPixmap(x, y, iconHighDPI->pixmap(size, size)); - if (x + dx > maxX) - y+=dy; - x = ((x + dx) % maxX); - } - - x = 10; - y+=dy; - } private: @@ -1471,7 +1438,6 @@ int main(int argc, char **argv) } QApplication app(argc, argv); - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QCoreApplication::setApplicationVersion(QT_VERSION_STR); QCommandLineParser parser; -- cgit v1.2.3