From dce106c77cc2ecf58ceb38a041698dc35a80183c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 28 Aug 2020 11:38:07 +0200
Subject: High-DPI: Remove usage of Qt::AA_EnableHighDpiScaling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This attribute is now on by default.

Change-Id: I7c9d2e3445d204d3450758673048d514bc9c850c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 examples/widgets/gallery/main.cpp                    | 5 +----
 examples/widgets/graphicsview/collidingmice/main.cpp | 3 ---
 examples/widgets/graphicsview/diagramscene/main.cpp  | 3 ---
 examples/widgets/itemviews/addressbook/main.cpp      | 3 ---
 examples/widgets/itemviews/spreadsheet/main.cpp      | 3 ---
 examples/widgets/mainwindows/application/main.cpp    | 3 ---
 examples/widgets/mainwindows/dockwidgets/main.cpp    | 3 ---
 examples/widgets/mainwindows/mainwindow/main.cpp     | 1 -
 examples/widgets/painting/concentriccircles/main.cpp | 3 ---
 examples/widgets/painting/fontsampler/main.cpp       | 3 ---
 examples/widgets/tools/undo/main.cpp                 | 3 ---
 examples/widgets/widgets/calculator/main.cpp         | 3 ---
 examples/widgets/widgets/elidedlabel/main.cpp        | 3 ---
 examples/widgets/widgets/scribble/main.cpp           | 3 ---
 examples/widgets/widgets/sliders/main.cpp            | 3 ---
 15 files changed, 1 insertion(+), 44 deletions(-)

(limited to 'examples/widgets')

diff --git a/examples/widgets/gallery/main.cpp b/examples/widgets/gallery/main.cpp
index 688a1d6039..a32c8eb8e1 100644
--- a/examples/widgets/gallery/main.cpp
+++ b/examples/widgets/gallery/main.cpp
@@ -61,11 +61,8 @@ int main(int argc, char *argv[])
             useHighDpiScaling = false;
     }
 
-    if (useHighDpiScaling) {
-        QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    } else {
+    if (!useHighDpiScaling)
         QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
-    }
 
     QApplication app(argc, argv);
     WidgetGallery gallery;
diff --git a/examples/widgets/graphicsview/collidingmice/main.cpp b/examples/widgets/graphicsview/collidingmice/main.cpp
index c9ad90260f..ef6d6cca64 100644
--- a/examples/widgets/graphicsview/collidingmice/main.cpp
+++ b/examples/widgets/graphicsview/collidingmice/main.cpp
@@ -58,9 +58,6 @@ static constexpr int MouseCount = 7;
 //! [0]
 int main(int argc, char **argv)
 {
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
     QApplication app(argc, argv);
 //! [0]
 
diff --git a/examples/widgets/graphicsview/diagramscene/main.cpp b/examples/widgets/graphicsview/diagramscene/main.cpp
index 3e321259c5..eefaa86554 100644
--- a/examples/widgets/graphicsview/diagramscene/main.cpp
+++ b/examples/widgets/graphicsview/diagramscene/main.cpp
@@ -55,9 +55,6 @@
 int main(int argv, char *args[])
 {
     Q_INIT_RESOURCE(diagramscene);
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
 
     QApplication app(argv, args);
     MainWindow mainWindow;
diff --git a/examples/widgets/itemviews/addressbook/main.cpp b/examples/widgets/itemviews/addressbook/main.cpp
index 86a11c5850..0731287cdd 100644
--- a/examples/widgets/itemviews/addressbook/main.cpp
+++ b/examples/widgets/itemviews/addressbook/main.cpp
@@ -55,9 +55,6 @@
 //! [0]
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
     QApplication app(argc, argv);
     MainWindow mw;
     mw.show();
diff --git a/examples/widgets/itemviews/spreadsheet/main.cpp b/examples/widgets/itemviews/spreadsheet/main.cpp
index 968312d097..9a6dbf6817 100644
--- a/examples/widgets/itemviews/spreadsheet/main.cpp
+++ b/examples/widgets/itemviews/spreadsheet/main.cpp
@@ -56,9 +56,6 @@
 int main(int argc, char **argv)
 {
     Q_INIT_RESOURCE(spreadsheet);
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
 
     QApplication app(argc, argv);
     SpreadSheet sheet(10, 6);
diff --git a/examples/widgets/mainwindows/application/main.cpp b/examples/widgets/mainwindows/application/main.cpp
index b46e1116dc..78db7134a3 100644
--- a/examples/widgets/mainwindows/application/main.cpp
+++ b/examples/widgets/mainwindows/application/main.cpp
@@ -58,9 +58,6 @@
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(application);
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
 
     QApplication app(argc, argv);
     QCoreApplication::setOrganizationName("QtProject");
diff --git a/examples/widgets/mainwindows/dockwidgets/main.cpp b/examples/widgets/mainwindows/dockwidgets/main.cpp
index bf3ad9bcf7..ff3ba506a8 100644
--- a/examples/widgets/mainwindows/dockwidgets/main.cpp
+++ b/examples/widgets/mainwindows/dockwidgets/main.cpp
@@ -54,9 +54,6 @@
 
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
     QApplication app(argc, argv);
     Q_INIT_RESOURCE(dockwidgets);
     MainWindow mainWin;
diff --git a/examples/widgets/mainwindows/mainwindow/main.cpp b/examples/widgets/mainwindows/mainwindow/main.cpp
index dcaabd195f..b68be3cdf6 100644
--- a/examples/widgets/mainwindows/mainwindow/main.cpp
+++ b/examples/widgets/mainwindows/mainwindow/main.cpp
@@ -175,7 +175,6 @@ static ParseCommandLineArgumentsResult
 
 int main(int argc, char **argv)
 {
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QApplication app(argc, argv);
     MainWindow::CustomSizeHintMap customSizeHints;
     switch (parseCustomSizeHints(QCoreApplication::arguments(), &customSizeHints)) {
diff --git a/examples/widgets/painting/concentriccircles/main.cpp b/examples/widgets/painting/concentriccircles/main.cpp
index 00456195d9..d9fa2879c4 100644
--- a/examples/widgets/painting/concentriccircles/main.cpp
+++ b/examples/widgets/painting/concentriccircles/main.cpp
@@ -54,9 +54,6 @@
 
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
     QApplication app(argc, argv);
     Window window;
     window.show();
diff --git a/examples/widgets/painting/fontsampler/main.cpp b/examples/widgets/painting/fontsampler/main.cpp
index cec6929827..1bf46b226f 100644
--- a/examples/widgets/painting/fontsampler/main.cpp
+++ b/examples/widgets/painting/fontsampler/main.cpp
@@ -54,9 +54,6 @@
 
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
     QApplication app(argc, argv);
     MainWindow window;
     window.show();
diff --git a/examples/widgets/tools/undo/main.cpp b/examples/widgets/tools/undo/main.cpp
index 1a6dcf8c48..a5ec1b1b83 100644
--- a/examples/widgets/tools/undo/main.cpp
+++ b/examples/widgets/tools/undo/main.cpp
@@ -54,9 +54,6 @@
 int main(int argc, char **argv)
 {
     Q_INIT_RESOURCE(undo);
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
 
     QApplication app(argc, argv);
 
diff --git a/examples/widgets/widgets/calculator/main.cpp b/examples/widgets/widgets/calculator/main.cpp
index 5f59d00ca6..a034bb262e 100644
--- a/examples/widgets/widgets/calculator/main.cpp
+++ b/examples/widgets/widgets/calculator/main.cpp
@@ -54,9 +54,6 @@
 
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
     QApplication app(argc, argv);
     Calculator calc;
     calc.show();
diff --git a/examples/widgets/widgets/elidedlabel/main.cpp b/examples/widgets/widgets/elidedlabel/main.cpp
index 58507766e7..1c620c1d41 100644
--- a/examples/widgets/widgets/elidedlabel/main.cpp
+++ b/examples/widgets/widgets/elidedlabel/main.cpp
@@ -55,9 +55,6 @@
 //! [0]
 int main( int argc, char *argv[] )
 {
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
     QApplication application( argc, argv );
     TestWidget w;
     w.showFullScreen();
diff --git a/examples/widgets/widgets/scribble/main.cpp b/examples/widgets/widgets/scribble/main.cpp
index cec6929827..1bf46b226f 100644
--- a/examples/widgets/widgets/scribble/main.cpp
+++ b/examples/widgets/widgets/scribble/main.cpp
@@ -54,9 +54,6 @@
 
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
     QApplication app(argc, argv);
     MainWindow window;
     window.show();
diff --git a/examples/widgets/widgets/sliders/main.cpp b/examples/widgets/widgets/sliders/main.cpp
index 9bf18cb6d4..99725195e5 100644
--- a/examples/widgets/widgets/sliders/main.cpp
+++ b/examples/widgets/widgets/sliders/main.cpp
@@ -54,9 +54,6 @@
 
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_ANDROID
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
     QApplication app(argc, argv);
     Window window;
     window.show();
-- 
cgit v1.2.3