From dce106c77cc2ecf58ceb38a041698dc35a80183c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= 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 Reviewed-by: Tor Arne Vestbø --- tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp | 4 ---- tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp | 4 ---- tests/manual/highdpi/main.cpp | 6 ------ tests/manual/qcursor/qcursorhighdpi/main.cpp | 4 +--- tests/manual/rhi/hellominimalcrossgfxtriangle/main.cpp | 1 - tests/manual/rhi/multiwindow/multiwindow.cpp | 1 - tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp | 1 - tests/manual/rhi/offscreen/offscreen.cpp | 1 - tests/manual/rhi/shared/examplefw.h | 1 - 9 files changed, 1 insertion(+), 22 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index aa08f1c44d..3d4c50f19a 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -496,10 +496,6 @@ private: void tst_QGraphicsItem::initMain() { -#ifdef Q_OS_WIN - // Ensure minimum size constraints of framed windows on High DPI screens - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif } void tst_QGraphicsItem::cleanup() diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index 3da8e344bd..ef417bf914 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -267,10 +267,6 @@ protected: void tst_QHeaderView::initMain() { -#ifdef Q_OS_WIN - // Ensure minimum size constraints of framed windows on High DPI screens - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif } class QtTestModel: public QAbstractTableModel diff --git a/tests/manual/highdpi/main.cpp b/tests/manual/highdpi/main.cpp index f976d1c590..4d70198d29 100644 --- a/tests/manual/highdpi/main.cpp +++ b/tests/manual/highdpi/main.cpp @@ -1458,7 +1458,6 @@ void MetricsTest::logScreenChangeSignal(const QObject *o, const char *name, cons int main(int argc, char **argv) { #define NOSCALINGOPTION "noscaling" -#define SCALINGOPTION "scaling" qInfo("High DPI tester %s", QT_VERSION_STR); @@ -1468,10 +1467,6 @@ int main(int argc, char **argv) QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); preAppOptionCount++; qInfo("AA_DisableHighDpiScaling"); - } else if (qstrcmp(argv[a], "--" SCALINGOPTION) == 0) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - preAppOptionCount++; - qInfo("AA_EnableHighDpiScaling"); } } @@ -1489,7 +1484,6 @@ int main(int argc, char **argv) QCommandLineOption controllerOption("interactive", "Show configuration window."); parser.addOption(controllerOption); parser.addOption(QCommandLineOption(NOSCALINGOPTION, "Set AA_DisableHighDpiScaling")); - parser.addOption(QCommandLineOption(SCALINGOPTION, "Set AA_EnableHighDpiScaling")); DemoContainerList demoList; demoList << new DemoContainer("pixmap", "Test pixmap painter"); diff --git a/tests/manual/qcursor/qcursorhighdpi/main.cpp b/tests/manual/qcursor/qcursorhighdpi/main.cpp index 5a8bc542b9..2e920ab231 100644 --- a/tests/manual/qcursor/qcursorhighdpi/main.cpp +++ b/tests/manual/qcursor/qcursorhighdpi/main.cpp @@ -339,9 +339,7 @@ int main(int argc, char *argv[]) std::copy(argv + 1, argv + argc, std::back_inserter(arguments)); #if QT_VERSION > 0x050000 - if (arguments.contains("-s")) - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - else if (arguments.contains("-n")) + if (arguments.contains("-n")) QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); #endif // Qt 5 diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/main.cpp b/tests/manual/rhi/hellominimalcrossgfxtriangle/main.cpp index 4ef3359ed0..8e04e8303d 100644 --- a/tests/manual/rhi/hellominimalcrossgfxtriangle/main.cpp +++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/main.cpp @@ -77,7 +77,6 @@ QString graphicsApiName(QRhi::Implementation graphicsApi) int main(int argc, char **argv) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QRhi::Implementation graphicsApi; diff --git a/tests/manual/rhi/multiwindow/multiwindow.cpp b/tests/manual/rhi/multiwindow/multiwindow.cpp index 222f82b472..f48b931b01 100644 --- a/tests/manual/rhi/multiwindow/multiwindow.cpp +++ b/tests/manual/rhi/multiwindow/multiwindow.cpp @@ -525,7 +525,6 @@ void closeWindow() int main(int argc, char **argv) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); #if defined(Q_OS_WIN) diff --git a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp index 3a2de89291..2e80cea9b3 100644 --- a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp +++ b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp @@ -725,7 +725,6 @@ void closeWindow() int main(int argc, char **argv) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); #if defined(Q_OS_WIN) diff --git a/tests/manual/rhi/offscreen/offscreen.cpp b/tests/manual/rhi/offscreen/offscreen.cpp index 2e2f505efb..81356c02b2 100644 --- a/tests/manual/rhi/offscreen/offscreen.cpp +++ b/tests/manual/rhi/offscreen/offscreen.cpp @@ -125,7 +125,6 @@ QString graphicsApiName() int main(int argc, char **argv) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); #if defined(Q_OS_WIN) diff --git a/tests/manual/rhi/shared/examplefw.h b/tests/manual/rhi/shared/examplefw.h index 880efb546e..cac9a5cfdf 100644 --- a/tests/manual/rhi/shared/examplefw.h +++ b/tests/manual/rhi/shared/examplefw.h @@ -440,7 +440,6 @@ void Window::render() int main(int argc, char **argv) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QLoggingCategory::setFilterRules(QLatin1String("qt.rhi.*=true")); -- cgit v1.2.3