diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-31 11:43:22 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-02-03 15:01:53 +0000 |
commit | 4e7af2061e8c323b2a21f0549643a2cfab191664 (patch) | |
tree | 54c6046915aee4a91eb6178183c022b8e547d244 /src/testlib/.prev_CMakeLists.txt | |
parent | 6251963ecd26bfc480b2871e26b6df4d7ab88cee (diff) | |
parent | 3f386095adc6c280008c7e811e88f0215f1d862f (diff) |
Merge remote-tracking branch 'origin/wip/cmake' into dev
This pulls the CMake port, which not only adds CMake files but also
modifies existing code. A brief summary of "seemingly unrelated" changes:
* configure.json was re-formatted to not use multi-line strings. That
is an extension of the Qt JSON parser but not JSON compliant, which
is needed for the configure.json-to-cmake conversion script (python).
* Some moc inclusions were added due to CMake's slightly different way
of handling moc. With the changes the files build with qmake and cmake.
* Since CMake just grep's for the Q_OBJECT macro to determine whether to
call moc (instead of doing pre-processing like qmake), the existing use
of "Q_OBJECT" in our documentation was changed to \Q_OBJECT, which cmake
doesn't see and which is now a qdoc macro.
* QTestLib's qFindTestData was extended to also search in the source
directory known at build time.
What this change also brings is a new way of building modules in Coin by using
YAML configuration files that describe the steps of building and testing in Coin
specific terms. The platform configuration files in qt5 are instructed to use the
old Coin built-in way of testing ("UseLegacyInstructions" feature) but for any
configurations that do not have this, these yaml files in the coin/ sub-directory
are used and shared across repositories.
Change-Id: I1d832c3400e8d6945ad787024ba60e7440225c08
Diffstat (limited to 'src/testlib/.prev_CMakeLists.txt')
-rw-r--r-- | src/testlib/.prev_CMakeLists.txt | 143 |
1 files changed, 143 insertions, 0 deletions
diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt new file mode 100644 index 0000000000..5859ae18fa --- /dev/null +++ b/src/testlib/.prev_CMakeLists.txt @@ -0,0 +1,143 @@ +# Generated from testlib.pro. + +##################################################################### +## Test Module: +##################################################################### + +qt_add_module(Test + QMAKE_MODULE_CONFIG console testlib_defines + EXCEPTIONS + SOURCES + qabstracttestlogger.cpp qabstracttestlogger_p.h + qasciikey.cpp + qbenchmark.cpp qbenchmark.h qbenchmark_p.h + qbenchmarkevent.cpp qbenchmarkevent_p.h + qbenchmarkmeasurement.cpp qbenchmarkmeasurement_p.h + qbenchmarkmetric.cpp qbenchmarkmetric.h qbenchmarkmetric_p.h + qbenchmarkperfevents.cpp qbenchmarkperfevents_p.h + qbenchmarktimemeasurers_p.h + qcsvbenchmarklogger.cpp qcsvbenchmarklogger_p.h + qplaintestlogger.cpp qplaintestlogger_p.h + qsignaldumper.cpp qsignaldumper_p.h + qsignalspy.h + qtaptestlogger.cpp qtaptestlogger_p.h + qteamcitylogger.cpp qteamcitylogger_p.h + qtest.h + qtest_gui.h + qtest_network.h + qtest_widgets.h + qtestaccessible.h + qtestassert.h + qtestblacklist.cpp qtestblacklist_p.h + qtestcase.cpp qtestcase.h + qtestcoreelement_p.h + qtestcorelist_p.h + qtestdata.cpp qtestdata.h + qtestelement.cpp qtestelement_p.h + qtestelementattribute.cpp qtestelementattribute_p.h + qtestevent.h + qtesteventloop.h + qtesthelpers_p.h + qtestkeyboard.h + qtestlog.cpp qtestlog_p.h + qtestmouse.cpp qtestmouse.h + qtestresult.cpp qtestresult_p.h + qtestspontaneevent.h + qtestsystem.h + qtesttable.cpp qtesttable_p.h + qtesttouch.h + qtestxunitstreamer.cpp qtestxunitstreamer_p.h + qttestglobal.h + qxmltestlogger.cpp qxmltestlogger_p.h + qxunittestlogger.cpp qxunittestlogger_p.h + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + QT_NO_DATASTREAM + QT_NO_FOREACH + LIBRARIES + Qt::CorePrivate + PUBLIC_LIBRARIES + Qt::Core + COMPILE_OPTIONS + --cs-exclude-file-abs-wildcard=${QT_SOURCE_TREE}/* + --cs-include-file-abs-wildcard=*/src/testlib/* + --cs-mcc + --cs-mcdc + LINK_OPTIONS + "$$COVERAGE_OPTIONS" +) + +#### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: +# MODULE_CONFIG = "console" "testlib_defines" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded: +# QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library" + +qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester + SOURCES + qabstractitemmodeltester.cpp qabstractitemmodeltester.h +) + +qt_extend_target(Test CONDITION QT_FEATURE_valgrind + SOURCES + qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h +) + +qt_extend_target(Test CONDITION embedded + COMPILE_OPTIONS + -fno-rtti +) + +qt_extend_target(Test CONDITION APPLE + SOURCES + qappletestlogger.cpp qappletestlogger_p.h + PUBLIC_LIBRARIES + ${FWSecurity} +) + +qt_extend_target(Test CONDITION APPLE_OSX + SOURCES + qtestutil_macos.mm qtestutil_macos_p.h + PUBLIC_LIBRARIES + ${FWApplicationServices} + ${FWFoundation} + ${FWIOKit} +) + +qt_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) + SOURCES + qxctestlogger.mm qxctestlogger_p.h + DEFINES + HAVE_XCTEST + PUBLIC_LIBRARIES + ${FWFoundation} +) + +qt_extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) + COMPILE_OPTIONS + -F/Developer/Library/Frameworks + LINK_OPTIONS + "-F$${platform_dev_frameworks_path}" + "-weak_framework" + "XCTest" +) + +#### Keys ignored in scope 9:.:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY: +# MODULE_CONFIG = "xctest" + +#### Keys ignored in scope 10:.:.:testlib.pro:NOT TARGET Qt::Gui: +# HEADERSCLEAN_EXCLUDE = "qtest_gui.h" "qtestaccessible.h" "qtestkeyboard.h" "qtestmouse.h" "qtesttouch.h" + +#### Keys ignored in scope 11:.:.:testlib.pro:NOT TARGET Qt::Widgets: +# HEADERSCLEAN_EXCLUDE = "qtest_widgets.h" + +#### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: +# HEADERSCLEAN_EXCLUDE = "qtest_network.h" +qt_add_docs(Test + doc/qttestlib.qdocconf +) + |