From ebd0dd6ebc916b978a5a2cf0139f40ae0b48a96f Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 25 Jul 2022 09:54:07 +0200 Subject: [PATCH] Drop Qt5: Manual tests: Remove code below Qt 6.0.0 Change-Id: I87e267415ec84001ff594b3900ce8be4f0cadd73 Reviewed-by: hjk Reviewed-by: Reviewed-by: Eike Ziller --- tests/manual/proparser/main.cpp | 7 +------ .../widgets/crumblepath/tst_manual_widgets_crumblepath.cpp | 4 ---- .../widgets/infolabel/tst_manual_widgets_infolabel.cpp | 4 ---- .../manhattanstyle/tst_manual_widgets_manhattanstyle.cpp | 5 ----- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/tests/manual/proparser/main.cpp b/tests/manual/proparser/main.cpp index aed9eefc8d3..9b501ad9cd0 100644 --- a/tests/manual/proparser/main.cpp +++ b/tests/manual/proparser/main.cpp @@ -142,13 +142,8 @@ int main(int argc, char **argv) QMakeGlobals option; QString qmake = QString::fromLocal8Bit(qgetenv("TESTREADER_QMAKE")); - if (qmake.isEmpty()) { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - qmake = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmake"); -#else + if (qmake.isEmpty()) qmake = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmake"); -#endif - } option.qmake_abslocation = QDir::cleanPath(qmake); option.initProperties(); diff --git a/tests/manual/widgets/crumblepath/tst_manual_widgets_crumblepath.cpp b/tests/manual/widgets/crumblepath/tst_manual_widgets_crumblepath.cpp index 06ba4b04bc4..1d4a05fddba 100644 --- a/tests/manual/widgets/crumblepath/tst_manual_widgets_crumblepath.cpp +++ b/tests/manual/widgets/crumblepath/tst_manual_widgets_crumblepath.cpp @@ -93,10 +93,6 @@ 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); auto *widget = new QWidget; diff --git a/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp b/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp index 803125fc48c..3d4d6840afd 100644 --- a/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp +++ b/tests/manual/widgets/infolabel/tst_manual_widgets_infolabel.cpp @@ -39,10 +39,6 @@ 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); auto widget = new QWidget; diff --git a/tests/manual/widgets/manhattanstyle/tst_manual_widgets_manhattanstyle.cpp b/tests/manual/widgets/manhattanstyle/tst_manual_widgets_manhattanstyle.cpp index 155ce326452..ccdbb59ebeb 100644 --- a/tests/manual/widgets/manhattanstyle/tst_manual_widgets_manhattanstyle.cpp +++ b/tests/manual/widgets/manhattanstyle/tst_manual_widgets_manhattanstyle.cpp @@ -123,11 +123,6 @@ 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); QMainWindow window;