Remove High DPI scaling attributes

They no longer have any effect and cause warnings and errors.

Change-Id: Ibeb25186d92a0755a06193f34892ac0d64314e2e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 7040246efcaddbbda534acc841bcd7ec6b1bdfb4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

3 files changed, 0 insertions, 13 deletions

diff --git a/tests/manual/axviewer/main.cpp b/tests/manual/axviewer/main.cpp
index 29ad3dc..8d5b83d 100644
--- a/tests/manual/axviewer/main.cpp
+++ b/tests/manual/axviewer/main.cpp
@@ -148,8 +148,6 @@ void MainWindow::showMetaObject()
 
 int main(int argc, char* argv[])
 {
-    if (isOptionSet(argc, argv, "-s"))
-        QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
     if (!isOptionSet(argc, argv, "-n"))
         QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
 
@@ -161,9 +159,6 @@ int main(int argc, char* argv[])
     parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
     parser.addHelpOption();
     parser.addVersionOption();
-    QCommandLineOption noScalingDummy(QStringLiteral("s"),
-                                      QStringLiteral("Set Qt::AA_DisableHighDpiScaling."));
-    parser.addOption(noScalingDummy);
     QCommandLineOption nativeSiblingsDummy(QStringLiteral("n"),
                                            QStringLiteral("Do not set Qt::AA_DontCreateNativeWidgetSiblings."));
     parser.addOption(nativeSiblingsDummy);
diff --git a/tests/manual/dumpcpp/main.cpp b/tests/manual/dumpcpp/main.cpp
index 2f3cef8..8259a66 100644
--- a/tests/manual/dumpcpp/main.cpp
+++ b/tests/manual/dumpcpp/main.cpp
@@ -96,9 +96,6 @@ void MainWindow::showMetaObject()
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-
     QApplication a(argc, argv);
 
     MainWindow w;
diff --git a/tools/testcon/main.cpp b/tools/testcon/main.cpp
index e1b5c29..3afb3f7 100644
--- a/tools/testcon/main.cpp
+++ b/tools/testcon/main.cpp
@@ -60,8 +60,6 @@ static void redirectDebugOutput(QtMsgType, const QMessageLogContext &, const QSt
 
 int main( int argc, char **argv )
 {
-    if (isOptionSet(argc, argv, "--no-scaling"))
-        QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
     if (isOptionSet(argc, argv, "--no-native-siblings"))
         QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
 
@@ -80,9 +78,6 @@ int main( int argc, char **argv )
     QCommandLineOption noMessageHandlerOption(QLatin1String("no-messagehandler"),
                                               QLatin1String("Suppress installation of the message handler."));
     parser.addOption(noMessageHandlerOption);
-    QCommandLineOption noScalingDummy(QLatin1String("no-scaling"),
-                                      QLatin1String("Set Qt::AA_DisableHighDpiScaling."));
-    parser.addOption(noScalingDummy);
     QCommandLineOption noNativeSiblingsDummy(QLatin1String("no-native-siblings"),
                                              QLatin1String("Set Qt::AA_DontCreateNativeWidgetSiblings."));
     parser.addOption(noNativeSiblingsDummy);