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 | |
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')
24 files changed, 2 insertions, 218 deletions
diff --git a/tests/auto/widgets/kernel/kernel.pro b/tests/auto/widgets/kernel/kernel.pro deleted file mode 100644 index 6fba636354..0000000000 --- a/tests/auto/widgets/kernel/kernel.pro +++ /dev/null @@ -1,32 +0,0 @@ -TEMPLATE=subdirs -SUBDIRS=\ - qapplication \ - qboxlayout \ - qformlayout \ - qgesturerecognizer \ - qgridlayout \ - qlayout \ - qstackedlayout \ - qtooltip \ - qwidget \ - qwidget_window \ - qwidgetmetatype \ - qwidgetsvariant \ - qwindowcontainer \ - qshortcut \ - qsizepolicy - -# QTBUG-87668 -android: SUBDIRS -= \ - qwidget - -darwin:SUBDIRS -= \ - qgesturerecognizer \ - -qtConfig(action):SUBDIRS += \ - qaction \ - qactiongroup \ - qwidgetaction - -!qtConfig(shortcut): SUBDIRS -= \ - qshortcut diff --git a/tests/auto/widgets/kernel/qaction/qaction.pro b/tests/auto/widgets/kernel/qaction/qaction.pro deleted file mode 100644 index c57107b1b0..0000000000 --- a/tests/auto/widgets/kernel/qaction/qaction.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qaction -QT += gui-private core-private widgets testlib -SOURCES += tst_qaction.cpp - - diff --git a/tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro b/tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro deleted file mode 100644 index 87521edfe9..0000000000 --- a/tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qactiongroup -QT += widgets testlib -SOURCES += tst_qactiongroup.cpp - - 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()); { diff --git a/tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro b/tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro deleted file mode 100644 index 1a2c6d6f66..0000000000 --- a/tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qboxlayout -QT += widgets testlib testlib-private -SOURCES += tst_qboxlayout.cpp - - diff --git a/tests/auto/widgets/kernel/qformlayout/qformlayout.pro b/tests/auto/widgets/kernel/qformlayout/qformlayout.pro deleted file mode 100644 index 0766b50f68..0000000000 --- a/tests/auto/widgets/kernel/qformlayout/qformlayout.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qformlayout -QT += widgets widgets-private testlib testlib-private -SOURCES += tst_qformlayout.cpp diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/qgesturerecognizer.pro b/tests/auto/widgets/kernel/qgesturerecognizer/qgesturerecognizer.pro deleted file mode 100644 index 7c9ddcfb03..0000000000 --- a/tests/auto/widgets/kernel/qgesturerecognizer/qgesturerecognizer.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qgesturerecognizer -QT += widgets testlib gui-private core-private -SOURCES += tst_qgesturerecognizer.cpp diff --git a/tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro b/tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro deleted file mode 100644 index 8947658e8c..0000000000 --- a/tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -TARGET = tst_qgridlayout - -QT += widgets widgets-private testlib -QT += core-private gui-private testlib-private - -SOURCES += tst_qgridlayout.cpp -FORMS += sortdialog.ui - - - diff --git a/tests/auto/widgets/kernel/qlayout/qlayout.pro b/tests/auto/widgets/kernel/qlayout/qlayout.pro deleted file mode 100644 index e768e19a26..0000000000 --- a/tests/auto/widgets/kernel/qlayout/qlayout.pro +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG += testcase -TARGET = tst_qlayout - -QT += widgets widgets-private testlib testlib-private - -SOURCES += tst_qlayout.cpp -TESTDATA += baseline/* - -android:!android-embedded { - RESOURCES += \ - testdata.qrc -} diff --git a/tests/auto/widgets/kernel/qshortcut/qshortcut.pro b/tests/auto/widgets/kernel/qshortcut/qshortcut.pro deleted file mode 100644 index 043d062d60..0000000000 --- a/tests/auto/widgets/kernel/qshortcut/qshortcut.pro +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG += testcase -TARGET = tst_qshortcut - -# Project Configuration ---------------------------------------------- -INCLUDEPATH += ../ - -# Normal Test Files -------------------------------------------------- -QT += widgets testlib -HEADERS += -SOURCES += tst_qshortcut.cpp diff --git a/tests/auto/widgets/kernel/qsizepolicy/qsizepolicy.pro b/tests/auto/widgets/kernel/qsizepolicy/qsizepolicy.pro deleted file mode 100644 index d325bc4aeb..0000000000 --- a/tests/auto/widgets/kernel/qsizepolicy/qsizepolicy.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -contains(QT_CONFIG, c++14): CONFIG += c++14 -TARGET = tst_qsizepolicy - -QT += widgets widgets-private testlib - -SOURCES += tst_qsizepolicy.cpp diff --git a/tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro b/tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro deleted file mode 100644 index 1f94c1b386..0000000000 --- a/tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qstackedlayout -QT += widgets testlib -SOURCES += tst_qstackedlayout.cpp - - - diff --git a/tests/auto/widgets/kernel/qtooltip/qtooltip.pro b/tests/auto/widgets/kernel/qtooltip/qtooltip.pro deleted file mode 100644 index 6e5dd738cb..0000000000 --- a/tests/auto/widgets/kernel/qtooltip/qtooltip.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qtooltip -QT += widgets testlib -SOURCES += tst_qtooltip.cpp diff --git a/tests/auto/widgets/kernel/qwidget/qwidget.pro b/tests/auto/widgets/kernel/qwidget/qwidget.pro deleted file mode 100644 index 56d3ee7b96..0000000000 --- a/tests/auto/widgets/kernel/qwidget/qwidget.pro +++ /dev/null @@ -1,19 +0,0 @@ -CONFIG += testcase -testcase.timeout = 600 # this test is slow -TARGET = tst_qwidget - -QT += widgets core-private gui-private widgets-private testlib testlib-private - -SOURCES += tst_qwidget.cpp -RESOURCES = qwidget.qrc - -aix-g++*:QMAKE_CXXFLAGS+=-fpermissive - -CONFIG += x11inc - -mac { - LIBS += -framework Security -framework AppKit - OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm -} - -win32: LIBS += -luser32 -lgdi32 diff --git a/tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro b/tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro deleted file mode 100644 index 00bf763c35..0000000000 --- a/tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qwidget_window -QT += widgets testlib core-private gui-private testlib-private -SOURCES += tst_qwidget_window.cpp diff --git a/tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro b/tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro deleted file mode 100644 index f443758eea..0000000000 --- a/tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qwidgetaction -QT += widgets testlib testlib-private -SOURCES += tst_qwidgetaction.cpp - - diff --git a/tests/auto/widgets/kernel/qwidgetmetatype/qwidgetmetatype.pro b/tests/auto/widgets/kernel/qwidgetmetatype/qwidgetmetatype.pro deleted file mode 100644 index 55228e6a1e..0000000000 --- a/tests/auto/widgets/kernel/qwidgetmetatype/qwidgetmetatype.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qwidgetmetatype -QT += widgets testlib -SOURCES += tst_qwidgetmetatype.cpp diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/qwidgetsvariant.pro b/tests/auto/widgets/kernel/qwidgetsvariant/qwidgetsvariant.pro deleted file mode 100644 index 7979e92087..0000000000 --- a/tests/auto/widgets/kernel/qwidgetsvariant/qwidgetsvariant.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase -TARGET = tst_qwidgetsvariant -INCLUDEPATH += $$PWD/../../../other/qvariant_common -SOURCES += tst_qwidgetsvariant.cpp -QT += testlib widgets - diff --git a/tests/auto/widgets/kernel/qwindowcontainer/qwindowcontainer.pro b/tests/auto/widgets/kernel/qwindowcontainer/qwindowcontainer.pro deleted file mode 100644 index 50069b7e3e..0000000000 --- a/tests/auto/widgets/kernel/qwindowcontainer/qwindowcontainer.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qwindowcontainer -QT += widgets testlib -SOURCES += tst_qwindowcontainer.cpp |