From 2dc46c09026362cc267b1183faf09fb29479ef93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
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 <volker.hilsheimer@qt.io>
---
 tests/manual/dialogs/main.cpp        |  4 ----
 tests/manual/highdpi/main.cpp        | 34 ----------------------------------
 tests/manual/widgets/styles/main.cpp |  1 -
 3 files changed, 39 deletions(-)

(limited to 'tests')

diff --git a/tests/manual/dialogs/main.cpp b/tests/manual/dialogs/main.cpp
index 07df8f5cf4..2676ceeb52 100644
--- a/tests/manual/dialogs/main.cpp
+++ b/tests/manual/dialogs/main.cpp
@@ -126,10 +126,6 @@ void MainWindow::aboutDialog()
 
 int main(int argc, char *argv[])
 {
-#if QT_VERSION >= 0x050600
-    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
-
     for (int a = 1; a < argc; ++a) {
         if (!qstrcmp(argv[a], "-n")) {
             qDebug("AA_DontUseNativeDialogs");
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;
diff --git a/tests/manual/widgets/styles/main.cpp b/tests/manual/widgets/styles/main.cpp
index 3a20c3228c..a2b4ff8228 100644
--- a/tests/manual/widgets/styles/main.cpp
+++ b/tests/manual/widgets/styles/main.cpp
@@ -295,7 +295,6 @@ void MainWindow::updateDescription()
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
     QApplication app(argc, argv);
     MainWindow mw;
     mw.show();
-- 
cgit v1.2.3