Use build-system to declare tests that are low-DPI

Change-Id: I6da7204683b3c46232cfc542ed5e28131a82e87d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

11 files changed, 6 insertions, 22 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 3d4c50f19a..200cf3c82f 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -286,9 +286,6 @@ class tst_QGraphicsItem : public QObject
 {
     Q_OBJECT
 
-public:
-    static void initMain();
-
 private slots:
     void cleanup();
     void construction();
@@ -494,10 +491,6 @@ private:
     QPointingDevice *m_touchDevice = QTest::createTouchDevice();
 };
 
-void tst_QGraphicsItem::initMain()
-{
-}
-
 void tst_QGraphicsItem::cleanup()
 {
     QVERIFY(QApplication::topLevelWidgets().isEmpty());
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
index 3208cf2b36..f0865f6a37 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 qt_add_test(tst_qgraphicsscene
+    LOWDPI
     SOURCES
         tst_qgraphicsscene.cpp
     DEFINES
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
index fe8e83ee0a..72c6169afd 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase testcase_lowdpi
 TARGET = tst_qgraphicsscene
 QT += widgets widgets-private testlib
 QT += core-private gui-private
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 5ecb401284..0b3e132936 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -185,7 +185,6 @@ class tst_QGraphicsScene : public QObject
     Q_OBJECT
 public:
     tst_QGraphicsScene();
-    static void initMain() { QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); }
 
 public slots:
     void cleanup();
diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index ef417bf914..ff76ddc39c 100644
--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
@@ -104,7 +104,6 @@ class tst_QHeaderView : public QObject
 
 public:
     tst_QHeaderView();
-    static void initMain();
 
 private slots:
     void initTestCase();
@@ -265,10 +264,6 @@ protected:
     QElapsedTimer timer;
 };
 
-void tst_QHeaderView::initMain()
-{
-}
-
 class QtTestModel: public QAbstractTableModel
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qframe/CMakeLists.txt b/tests/auto/widgets/widgets/qframe/CMakeLists.txt
index 89f91d1967..ac53d07fbd 100644
--- a/tests/auto/widgets/widgets/qframe/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qframe/CMakeLists.txt
@@ -11,6 +11,7 @@ file(GLOB_RECURSE test_data_glob
 list(APPEND test_data ${test_data_glob})
 
 qt_add_test(tst_qframe
+    LOWDPI
     SOURCES
         tst_qframe.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qframe/qframe.pro b/tests/auto/widgets/widgets/qframe/qframe.pro
index 1da7eb1d11..cf874cbc8e 100644
--- a/tests/auto/widgets/widgets/qframe/qframe.pro
+++ b/tests/auto/widgets/widgets/qframe/qframe.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase testcase_lowdpi
 TARGET = tst_qframe
 
 QT += testlib widgets
diff --git a/tests/auto/widgets/widgets/qframe/tst_qframe.cpp b/tests/auto/widgets/widgets/qframe/tst_qframe.cpp
index 0ca8dc0776..b5272f6b1a 100644
--- a/tests/auto/widgets/widgets/qframe/tst_qframe.cpp
+++ b/tests/auto/widgets/widgets/qframe/tst_qframe.cpp
@@ -38,9 +38,6 @@ class tst_QFrame : public QObject
 {
     Q_OBJECT
 
-public:
-    static void initMain() { QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); }
-
 private slots:
     void testDefaults();
     void testInitStyleOption_data();
diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
index d1af2e811c..062a468c6c 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
+++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 qt_add_test(tst_qopenglwidget
+    LOWDPI
     SOURCES
         tst_qopenglwidget.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro b/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro
index 792bbf4529..9a6b0e2040 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro
+++ b/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase testcase_lowdpi
 TARGET = tst_qopenglwidget
 QT += opengl opengl-private gui-private core-private testlib widgets openglwidgets
 
diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
index 099a099c13..0b6d161890 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
+++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
@@ -48,9 +48,6 @@ class tst_QOpenGLWidget : public QObject
 {
     Q_OBJECT
 
-public:
-    static void initMain() { QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); }
-
 private slots:
     void initTestCase();
     void create();