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 /src/testlib | |
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 'src/testlib')
-rw-r--r-- | src/testlib/doc/snippets/code/code.pro | 15 | ||||
-rw-r--r-- | src/testlib/doc/snippets/code/doc_src_qtestlib.pro | 11 | ||||
-rw-r--r-- | src/testlib/doc/snippets/code/doc_src_qttest.pro | 3 | ||||
-rw-r--r-- | src/testlib/doc/snippets/snippets.pro | 8 | ||||
-rw-r--r-- | src/testlib/selfcover.pri | 28 | ||||
-rw-r--r-- | src/testlib/testlib.pro | 155 |
6 files changed, 0 insertions, 220 deletions
diff --git a/src/testlib/doc/snippets/code/code.pro b/src/testlib/doc/snippets/code/code.pro deleted file mode 100644 index ddd5f9b261..0000000000 --- a/src/testlib/doc/snippets/code/code.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = lib -TARGET = code_snippets -QT += core sql widgets - -#! [qmake_use] -QT += testlib -#! [qmake_use] - -SOURCES = \ - doc_src_qtestevent.cpp \ - doc_src_qtestlib.cpp \ - doc_src_qtqskip.cpp \ - doc_src_qttest.cpp \ - src_corelib_kernel_qtestsupport_core.cpp - diff --git a/src/testlib/doc/snippets/code/doc_src_qtestlib.pro b/src/testlib/doc/snippets/code/doc_src_qtestlib.pro deleted file mode 100644 index c4aeb5e99c..0000000000 --- a/src/testlib/doc/snippets/code/doc_src_qtestlib.pro +++ /dev/null @@ -1,11 +0,0 @@ -#! [1] -QT += testlib -#! [1] - -#! [2] -CONFIG += testcase -#! [2] - -#! [3] -CONFIG += no_testcase_installs -#! [3] diff --git a/src/testlib/doc/snippets/code/doc_src_qttest.pro b/src/testlib/doc/snippets/code/doc_src_qttest.pro deleted file mode 100644 index 62b8fb064c..0000000000 --- a/src/testlib/doc/snippets/code/doc_src_qttest.pro +++ /dev/null @@ -1,3 +0,0 @@ -#! [1] -QT += testlib -#! [1] diff --git a/src/testlib/doc/snippets/snippets.pro b/src/testlib/doc/snippets/snippets.pro deleted file mode 100644 index abf63ebef5..0000000000 --- a/src/testlib/doc/snippets/snippets.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = - -contains(QT_BUILD_PARTS, tests) { - SUBDIRS += \ - code -} - diff --git a/src/testlib/selfcover.pri b/src/testlib/selfcover.pri deleted file mode 100644 index 7de50ba6e6..0000000000 --- a/src/testlib/selfcover.pri +++ /dev/null @@ -1,28 +0,0 @@ -# Configuration for testlib and its tests, to instrument with -# FrogLogic's Squish CoCo (cf. testcocoon.prf, which handles similar -# for general code; but testlib needs special handling). - -# Only for use when feature testlib_selfcover is enabled: -!qtConfig(testlib_selfcover): return() - -# This enables verification that testlib itself is adequately tested, -# as a grounds for trusting that testing with it is useful. -# Exclude all non-testlib source from coverage instrumentation: -COVERAGE_OPTIONS = --cs-exclude-file-abs-wildcard=$$QT_SOURCE_TREE/* -COVERAGE_OPTIONS += --cs-include-file-abs-wildcard=*/src/testlib/* -COVERAGE_OPTIONS += --cs-mcc # enable Multiple Condition Coverage -COVERAGE_OPTIONS += --cs-mcdc # enable Multiple Condition / Decision Coverage -# (recommended for ISO 26262 ASIL A, B and C -- highly recommended for ASIL D) -# https://doc.froglogic.com/squish-coco/4.1/codecoverage.html#sec%3Amcdc - -QMAKE_CFLAGS += $$COVERAGE_OPTIONS -QMAKE_CXXFLAGS += $$COVERAGE_OPTIONS -QMAKE_LFLAGS += $$COVERAGE_OPTIONS - -# FIXME: relies on QMAKE_* being just the command-names, with no path prefix -QMAKE_CC = cs$$QMAKE_CC -QMAKE_CXX = cs$$QMAKE_CXX -QMAKE_LINK = cs$$QMAKE_LINK -QMAKE_LINK_SHLIB = cs$$QMAKE_LINK_SHLIB -QMAKE_AR = cs$$QMAKE_AR -QMAKE_LIB = cs$$QMAKE_LIB diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro deleted file mode 100644 index 787df6b648..0000000000 --- a/src/testlib/testlib.pro +++ /dev/null @@ -1,155 +0,0 @@ -TARGET = QtTest -QT = core-private -CONFIG += exceptions - -MODULE_CONFIG = console testlib_defines - -unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \ - Unit \ - Testing \ - Library - -QMAKE_DOCS = $$PWD/doc/qttestlib.qdocconf - -HEADERS = \ - qabstracttestlogger_p.h \ - qbenchmark.h \ - qbenchmark_p.h \ - qbenchmarkmeasurement_p.h \ - qbenchmarktimemeasurers_p.h \ - qbenchmarkevent_p.h \ - qbenchmarkperfevents_p.h \ - qbenchmarkmetric.h \ - qbenchmarkmetric_p.h \ - qcsvbenchmarklogger_p.h \ - qplaintestlogger_p.h \ - qsignaldumper_p.h \ - qsignalspy.h \ - qteamcitylogger_p.h \ - qtestaccessible.h \ - qtestassert.h \ - qtestcase.h \ - qtestcoreelement_p.h \ - qtestcorelist_p.h \ - qtestdata.h \ - qtestevent.h \ - qtesteventloop.h \ - qtest_gui.h \ - qtest_network.h \ - qtest_widgets.h \ - qtest.h \ - qtestelement_p.h \ - qtestelementattribute_p.h \ - qtestkeyboard.h \ - qtestlog_p.h \ - qtestmouse.h \ - qtestresult_p.h \ - qtestspontaneevent.h \ - qtestsystem.h \ - qtesttable_p.h \ - qtesttouch.h \ - qtestblacklist_p.h \ - qtesthelpers_p.h \ - qttestglobal.h \ - qtestjunitstreamer_p.h \ - qtaptestlogger_p.h \ - qxmltestlogger_p.h \ - qjunittestlogger_p.h - -SOURCES = \ - qtestcase.cpp \ - qtestlog.cpp \ - qtesttable.cpp \ - qtestdata.cpp \ - qtestresult.cpp \ - qasciikey.cpp \ - qplaintestlogger.cpp \ - qxmltestlogger.cpp \ - qsignaldumper.cpp \ - qabstracttestlogger.cpp \ - qbenchmark.cpp \ - qbenchmarkmeasurement.cpp \ - qbenchmarkevent.cpp \ - qbenchmarkperfevents.cpp \ - qbenchmarkmetric.cpp \ - qcsvbenchmarklogger.cpp \ - qteamcitylogger.cpp \ - qtestelement.cpp \ - qtestelementattribute.cpp \ - qtestmouse.cpp \ - qtestjunitstreamer.cpp \ - qjunittestlogger.cpp \ - qtestblacklist.cpp \ - qtaptestlogger.cpp - -qtConfig(itemmodeltester) { - HEADERS += \ - qabstractitemmodeltester.h - - SOURCES += \ - qabstractitemmodeltester.cpp -} - -qtConfig(valgrind) { - HEADERS += \ - qbenchmarkvalgrind_p.h - SOURCES += \ - qbenchmarkvalgrind.cpp -} - -DEFINES *= QT_NO_CAST_TO_ASCII \ - QT_NO_CAST_FROM_ASCII \ - QT_NO_FOREACH \ - QT_NO_DATASTREAM -embedded:QMAKE_CXXFLAGS += -fno-rtti - -mac { - LIBS += -framework Security - - SOURCES += qappletestlogger.cpp - HEADERS += qappletestlogger_p.h - - macos { - HEADERS += qtestutil_macos_p.h - OBJECTIVE_SOURCES += qtestutil_macos.mm - LIBS += -framework Foundation -framework ApplicationServices -framework IOKit -framework AppKit - } - - # XCTest support (disabled for now) - false:!lessThan(QMAKE_XCODE_VERSION, "6.0") { - OBJECTIVE_SOURCES += qxctestlogger.mm - HEADERS += qxctestlogger_p.h - - DEFINES += HAVE_XCTEST - LIBS += -framework Foundation - - load(sdk) - !isEmpty(QMAKE_MAC_SDK_PLATFORM_PATH) { - platform_dev_frameworks_path = $${QMAKE_MAC_SDK_PLATFORM_PATH}/Developer/Library/Frameworks - - # We can't put this path into LIBS (so that it propagates to the prl file), as we - # don't know yet if the target that links to testlib will build under Xcode or not. - # The corresponding flags for the target lives in xctest.prf, where we do know. - QMAKE_LFLAGS += -F$${platform_dev_frameworks_path} -weak_framework XCTest - QMAKE_CXXFLAGS += -F$${platform_dev_frameworks_path} - MODULE_CONFIG += xctest - } - } -} - -# Exclude these headers from the clean check if their dependencies aren't -# being built -!qtHaveModule(gui) { - HEADERSCLEAN_EXCLUDE += qtest_gui.h \ - qtestaccessible.h \ - qtestkeyboard.h \ - qtestmouse.h \ - qtesttouch.h -} - -!qtHaveModule(widgets): HEADERSCLEAN_EXCLUDE += qtest_widgets.h - -!qtHaveModule(network): HEADERSCLEAN_EXCLUDE += qtest_network.h - -include(selfcover.pri) -load(qt_module) |