From 595a4a621d5ba94ce6ff0ae3042b39baa795ef7d Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 26 Aug 2021 13:00:36 +0200 Subject: [PATCH] Tests: Avoid Qt6-related deprecation warnings Qt::AA_EnableHighDpiScaling and Qt::AA_UseHighDpiPixmaps are deprecated Change-Id: I36a289f00feeaa472ee911a567c2a6160e259317 Reviewed-by: Christian Stenger --- .../widgets/crumblepath/tst_manual_widgets_crumblepath.cpp | 2 ++ tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp | 2 ++ .../manhattanstyle/tst_manual_widgets_manhattanstyle.cpp | 2 ++ tests/manual/widgets/tracing/tst_manual_widgets_tracing.cpp | 2 ++ 4 files changed, 8 insertions(+) diff --git a/tests/manual/widgets/crumblepath/tst_manual_widgets_crumblepath.cpp b/tests/manual/widgets/crumblepath/tst_manual_widgets_crumblepath.cpp index b86884d6df1..06ba4b04bc4 100644 --- a/tests/manual/widgets/crumblepath/tst_manual_widgets_crumblepath.cpp +++ b/tests/manual/widgets/crumblepath/tst_manual_widgets_crumblepath.cpp @@ -93,7 +93,9 @@ QWidget *shrinkingCrumblePath() int main(int argc, char *argv[]) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#endif // Qt < 6 QApplication app(argc, argv); diff --git a/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp b/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp index c77a7109b11..67e406c5884 100644 --- a/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp +++ b/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp @@ -39,7 +39,9 @@ using namespace Utils; int main(int argc, char *argv[]) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#endif // Qt < 6 QApplication app(argc, argv); diff --git a/tests/manual/widgets/manhattanstyle/tst_manual_widgets_manhattanstyle.cpp b/tests/manual/widgets/manhattanstyle/tst_manual_widgets_manhattanstyle.cpp index 59b5d34c926..155ce326452 100644 --- a/tests/manual/widgets/manhattanstyle/tst_manual_widgets_manhattanstyle.cpp +++ b/tests/manual/widgets/manhattanstyle/tst_manual_widgets_manhattanstyle.cpp @@ -123,8 +123,10 @@ static QWidget *centralWidget() int main(int argc, char *argv[]) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +#endif // Qt < 6 QApplication app(argc, argv); diff --git a/tests/manual/widgets/tracing/tst_manual_widgets_tracing.cpp b/tests/manual/widgets/tracing/tst_manual_widgets_tracing.cpp index d027536e9e7..ff895a7b385 100644 --- a/tests/manual/widgets/tracing/tst_manual_widgets_tracing.cpp +++ b/tests/manual/widgets/tracing/tst_manual_widgets_tracing.cpp @@ -162,8 +162,10 @@ public: int main(int argc, char *argv[]) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +#endif // Qt < 6 QApplication app(argc, argv);