diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-17 14:55:57 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-07 15:32:28 +0100 |
| commit | ad2da2d27a590333fc89a56fc58700a09c3017b3 (patch) | |
| tree | 7d916e7a15150d1ba3ca4af7f167e33f9d3c6cc6 /tests/auto/widgets/kernel/qapplication | |
| parent | fca3ea040c9d05f112c6fc018f0c8e8c68892642 (diff) | |
Remove the qmake project files
Remove the qmake project files for most of Qt.
Leave the qmake project files for examples, because we still test those
in the CI to ensure qmake does not regress.
Also leave the qmake project files for utils and other minor parts that
lack CMake project files.
Task-number: QTBUG-88742
Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests/auto/widgets/kernel/qapplication')
6 files changed, 2 insertions, 66 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro deleted file mode 100644 index 442bf33b61..0000000000 --- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT += widgets -CONFIG -= app_bundle - -debug_and_release { - CONFIG(debug, debug|release) { - TARGET = ../../debug/desktopsettingsaware_helper - } else { - TARGET = ../../release/desktopsettingsaware_helper - } -} else { - TARGET = ../desktopsettingsaware_helper -} - -SOURCES += main.cpp diff --git a/tests/auto/widgets/kernel/qapplication/modal/modal.pro b/tests/auto/widgets/kernel/qapplication/modal/modal.pro deleted file mode 100644 index e832d90821..0000000000 --- a/tests/auto/widgets/kernel/qapplication/modal/modal.pro +++ /dev/null @@ -1,15 +0,0 @@ -QT += widgets -SOURCES += main.cpp \ - base.cpp -debug_and_release { - CONFIG(debug, debug|release) { - TARGET = ../../debug/modal_helper - } else { - TARGET = ../../release/modal_helper - } -} else { - TARGET = ../modal_helper -} -CONFIG -= app_bundle -HEADERS += base.h - diff --git a/tests/auto/widgets/kernel/qapplication/qapplication.pro b/tests/auto/widgets/kernel/qapplication/qapplication.pro deleted file mode 100644 index 5154c915cd..0000000000 --- a/tests/auto/widgets/kernel/qapplication/qapplication.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS = desktopsettingsaware modal - -test.depends += $$SUBDIRS -SUBDIRS += test diff --git a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt index a93a677417..ad5209f9bf 100644 --- a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### # Collect test data -list(APPEND test_data "../test/test.pro") list(APPEND test_data "../tmp/README") list(APPEND test_data "../modal") diff --git a/tests/auto/widgets/kernel/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro deleted file mode 100644 index 39b099261a..0000000000 --- a/tests/auto/widgets/kernel/qapplication/test/test.pro +++ /dev/null @@ -1,28 +0,0 @@ -CONFIG += testcase - -QT += widgets widgets-private testlib -QT += core-private gui-private - -SOURCES += ../tst_qapplication.cpp - -builtin_testdata: DEFINES += BUILTIN_TESTDATA - -TESTDATA = ../test/test.pro ../tmp/README ../modal - -!android: SUBPROGRAMS = desktopsettingsaware modal - -debug_and_release { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qapplication - !android: TEST_HELPER_INSTALLS = ../debug/helper - for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../debug/$${file}" - } else { - TARGET = ../../release/tst_qapplication - !android: TEST_HELPER_INSTALLS = ../release/helper - for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../release/$${file}" - } -} else { - TARGET = ../tst_qapplication - !android: TEST_HELPER_INSTALLS = ../helper - for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}" -} diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 46ccc0c662..00e6adbc32 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -924,9 +924,9 @@ bool isPathListIncluded(const QStringList &l, const QStringList &r) void tst_QApplication::libraryPaths() { #ifndef BUILTIN_TESTDATA - const QString testDir = QFileInfo(QFINDTESTDATA("test/test.pro")).absolutePath(); + const QString testDir = QFileInfo(QFINDTESTDATA("test/CMakeLists.txt")).absolutePath(); #else - const QString testDir = QFileInfo(QFINDTESTDATA("test.pro")).absolutePath(); + const QString testDir = QFileInfo(QFINDTESTDATA("CMakeLists.txt")).absolutePath(); #endif QVERIFY(!testDir.isEmpty()); { |