summaryrefslogtreecommitdiff
path: root/cmake/QtTestHelpers.cmake
Commit message (Collapse)AuthorAgeFilesLines
* Fix an issue with passing NO_UNITY_BUILD_SOURCESAmir Masoud Abdol2023-03-151-1/+0
| | | | | | | | | | Amend 31518f1a4e3c4a7c77ae2e008e903a849ba75dd6 Amend 360293623094a31586981206e59c92aa6235163d Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ibb2fd881c02b6496f06b8b623fa6009358755a26 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Improve the internal handling of unity buildAmir Masoud Abdol2023-03-141-0/+5
| | | | | | | | | | | | | | | | | | | - Removed the NO_UNITY_BUILD argument from commands that disable it by default. - Add a warning in case NO_UNITY_BUILD or NO_UNITY_BUILD_SOURCES is being used where it is already disabled, e.g., qt_internal_add_test - Exclude all sources of a target from unity build if NO_UNITY_BUILD is set on the target. This sounds a bit harsh, but I have noticed that sometimes the same source file can be included somewhere else, and some unexpected collision may occur. - qt_examples_build_end excludes all its examples from the unity build. - qt_build_test now sets the CMAKE_UNITY_BUILD to OFF before configuring the tests, and restore its value when done. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ia42e7dd5a5bfb151db241deb639325720fd91eec Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Skip also QML tests in submodules when batching is onMikolaj Boc2023-03-131-1/+1
| | | | | | | | | | This should be handled later ideally, for now we should skip and QML tests targets are still being produced, which leads to errors on WASM. Task-number: QTBUG-109786 Change-Id: I3d0d1f3115e324c7a0cb036e972226310294b216 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Do not batch standalone tests; add an option to batch themMikolaj Boc2023-03-131-8/+16
| | | | | | | | | | Tests generated with qt-cmake-standalone-test will now not be batched by default. Defining the QT_BATCH_STANDALONE_TESTS environment variable will make the build system batch them. Fixes: QTBUG-111226 Change-Id: I9f01c662e22f8ffdd33e1c4d82619db0689fecc7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Avoid error with test helper when test batch is missingMikolaj Boc2023-03-131-2/+2
| | | | | | | | | | | | | | | | qt_internal_add_test_helper will fail if a test batch is missing and batching is enabled. It will now copy to the parent binary directory as without batching for simplicity, as this happens when batched tests are skipped. One consequence could be that when the first test specified has the NO_BATCH argument, this will incorrectly install the helper, but helpers still need extra work to function properly, so for now we just make it compile. Task-number: QTBUG-109786 Change-Id: Ib307ae79799422c2a4102885aa007ef043835e50 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Make manual tests use the usual wasm_shell.htmlMikolaj Boc2023-03-071-0/+2
| | | | | | | | | | | | Manual tests are supposed to display UI and be assessed manually, but currently they use the auto test runner by mistake. Use the normal wasm shell to fix this and make them work like usual applications. Fixes: QTBUG-111753 Change-Id: I9d3c0ad56e913b73737c5b72087e82980989d8b8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Align qt_internal_add_manual_test with qt_internal_add_testAmir Masoud Abdol2023-02-281-107/+72
| | | | | | | | | | | | | They now share their implementation. Manual tests can be created by passing the MANUAL arguments to the qt_internal_add_test as well. Pick-to: 6.5 Fixes: QTBUG-111382 Change-Id: I1c207b7e4a67526554df1ee43fe032bb20fc92fa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Matthias Rauter <matthias.rauter@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Skip non-qtbase tests on CoinMikolaj Boc2023-02-241-9/+16
| | | | | | | | | | The previous attempt failed as target coin configuration doesn't use superbuild. Skip the tests based on the TESTED_MODULE_COIN environment variable Task-number: QTBUG-109786 Change-Id: I0dbe6ff64ca4a2e81fef377865ef4e99b58c5eb2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add some utilities for UNITY_BUILDAmir Masoud Abdol2023-02-081-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | - The following commands accepts NO_UNITY_BUILD, and NO_UNITY_BUILD_SOURCES arguments to opt out of the unity build, and to exclude some source files from unity build, respectively. - qt_internal_add_executable - qt_internal_add_module - qt_internal_add_plugin - qt_internal_add_tool - qt_internal_extend_target - qt_internal_add_common_qt_library_helper - qt_internal_add_cmake_library - qt_internal_add_simd_part - Unity build is disabled by default in these: - qt_internal_add_test - qt_internal_add_test_helper - qt_internal_add_benchmark - qt_internal_add_3rdparty_library - qt_update_ignore_pch_source also excludes the files from unity_build Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I5d0e7df633738310a015142a6c73fbb78b6c3467 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Skip tests outside of qtbase on batching+superbuildMikolaj Boc2023-01-231-0/+40
| | | | | | | | | | | | | | | The batcher does not currently work properly with non-qtbase submodules. Disable them temporarily so that at least the tests in qtbase are batched. Do this from qtbase so that changes to each and every submodule are not necessary. Also, maintain a list of tests that were thus skipped. On any qt cmake internal function call that refers to such a target, identify the target as skipped and make the call a no-op. Fixes: QTBUG-109785 Change-Id: Ib0aa5d39eee8315ffd4ac62f6d1f44fe9bbf7a2f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Retire the qt_parse_all_argumentsAmir Masoud Abdol2023-01-181-8/+9
| | | | | | | | | | | This replaces the qt_parse_all_arguments macro with the built-in `cmake_parse_arguments(PARSE_ARGV`. In addition, a new function, _qt_internal_validate_all_args_are_parsed, can be used to check whether any _UNPARSED_ARGUMENTS have been passed to the function. Fixes: QTBUG-99238 Change-Id: I8cee83dc92dc6acdaaf747ea6ff9084c11dc649b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Concatenate blacklist files for test batchMikolaj Boc2023-01-171-3/+22
| | | | | | | | | | | | | This works by collecting the paths of all blacklist files and deferring a call which ultimately reads all of the files and glues them together to form a master blacklist file for the batch. There might be conflicting function names inside the batch. For now we ignore the problem, while keeping in mind that it exists. Fixes: QTBUG-110016 Change-Id: I9c8412097418c6e93297ab89af718d7466e2e451 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Kill the browser that CI on wasm opens for testingMikolaj Boc2023-01-121-0/+1
| | | | | | | | | Otherwise CI hangs if no existing browser can be reused (typical case) Fixes: QTBUG-109876 Change-Id: I63436a23c23c4b74c27c18effafde53bb6a4a34e Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Add Qt::Gui to batches unconditionallyMikolaj Boc2023-01-101-0/+5
| | | | | | | | | | | | This is needed for static plugins to work correctly as currently the only place where plugin logic is handled for non-standalone builds is in qt_internal_add_executable - adding the library later when encountered in one tests that get batched does not trigger plugin handling logic. Fixes: QTBUG-109812 Change-Id: Idcc2bc6b42b2b7ad6afb9796f554b0529de3de5f Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Only add defines for sources in batched targetMikolaj Boc2023-01-061-3/+1
| | | | | | | | | | When encountering a batchable target, only add its defines to the sources that the target contains. Otherwise, the defines interfere with other tests in the batch. Fixes: QTBUG-109848 Change-Id: I35d1665d29bb0ce93b82059f7f3b715070539d21 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Only set the deprecation define once for test batchMikolaj Boc2023-01-061-4/+2
| | | | | Change-Id: I215f7a0dbb0078be9fdeadb1f941304071a575fa Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* wasm: Always use basic password-store=basic in testsDavid Skoland2022-12-161-0/+1
| | | | | | | | | | | This makes sure the browser only uses a basic password store and doesn't try to do anything fancy with the OS pass store, since it causes an issue on opensuse (kwallet isn't set up in CI). Change-Id: Ib48a15f4834fa9bb26cf8cf3fff9bb4d0fd0238a Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* CMake: make QT_SKIP_DOCKER_COMPOSE more discoverableAhmad Samir2022-12-091-1/+3
| | | | | | | By adding a CMake option() that is OFF by default. Change-Id: Ic66cae5bb9739ae1db3e534f671cc1e9e4b09647 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add a dummy target for tests that get batchedMikolaj Boc2022-12-011-0/+10
| | | | | | | This is done to avoid cmake syntax errors when adding new tests. Change-Id: I8106b13a865b990c52e09573488881bd18e64c7f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: add a way to skip trying to set up docker on LinuxThiago Macieira2022-11-281-0/+3
| | | | | | | I keep getting this warning because docker-compose is not installed. Change-Id: Id8e48e8f498c4a029619fffd172932bd86ed03ba Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* wasm: Enable asyncify for testsDavid Skoland2022-11-241-0/+5
| | | | | | | | | Since a good number of tests use exec and friends, we want to use asyncify for them. Asyncify is still possible to enable universally with device options. Change-Id: I0916f55328c98f2ba179cda3757eeee9d27f3e47 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* wasm: Make Chrome default testing browserDavid Skoland2022-10-111-0/+2
| | | | | | | | | | | Currently, emrun will pick the browser to run tests on somewhat arbitrarily. For predictability and stability, we should use one browser as a basis, and Chrome seems to be a good fit as wasm features are generally in good shape on it and it has good support for launching from command-line. Change-Id: I1d06a5916ad24ab9df9b0826c0773c652e6d3fcd Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Use the js test runner for all tests on wasmMikolaj Boc2022-09-191-12/+15
| | | | | | | | Make cmake changes that have ctest run the emrun test runner for all tests that are build for wasm. Change-Id: I8c07068d79cfd0d745dbcc3d3f025c7c48fe1069 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix _qt_is_test_executable assignment for testsAlexandru Croitor2022-09-171-1/+2
| | | | | | | | | | | | | | | | | | | | | _qt_is_test_executable can only be set on a test that is backed by a real target. QMLTESTs might not backed by an executable target, if they are missing cpp SOURCES. Which led to errors like CMake Error at cmake/QtTestHelpers.cmake:510 (set_target_properties): set_target_properties Can not find target to add properties to: textedit Call Stack (most recent call first): tests/auto/qmltest/textedit/CMakeLists.txt:10 (qt_internal_add_test) Amends 62c681a5991b7f215e108f74c1dd3dd58c1d92c7 Change-Id: Ie66fd3e94484562061f851c0a034629959d091da Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Set target property _qt_is_test_executable on all testsMikolaj Boc2022-09-161-0/+1
| | | | | | | | | This is needed to later determine what kind of runner should be selected on WASM for the executable. Tests use the test runner, whereas other executables use qtLoader. Change-Id: I75aa361403b72f8e82a288967b8a81b8232d68dc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: propagate deprecation definitions to unit-testsIvan Solovev2022-09-061-1/+20
| | | | | | | | | | | | | | | If Qt itself is built without the deprecated APIs, but the tests are not, tests will fail to compile and/or link. This patch makes sure that the specified QT_DISABLE_DEPRECATED_UP_TO and QT_WARN_DEPRECATED_UP_TO values are correctly used in the tests. The definitions are propagated to tests, batched tests, manual tests and benchmarks. Fixes: QTBUG-104858 Change-Id: Idf15accaf96c47599084426ba625b985f507ca8b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add NO_EXCEPTIONS on WASM unconditionallyMikolaj Boc2022-09-021-1/+1
| | | | | | | | DISABLE_EXCEPTION_CATCHING is added unconditionally on WASM. Add NO_EXCEPTIONS for all WASM tests since those are never supported. Change-Id: I2ee10779e7ae0d285494ad650be52dee3099915a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Build in test data on WASMMikolaj Boc2022-09-011-1/+1
| | | | | | | | Local file system files are difficult to reach on WASM. Build the test data in so that it's reachable to WASM tests nevertheless. Change-Id: I65022db7645248d040434759fb60c3076fd65bd8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Relay the batched test name to ctest commandline on all platformsMikolaj Boc2022-08-291-2/+26
| | | | | | | | Extend the support of pointing at the right test from batch from WASM to all supported platforms. Change-Id: I9b6342ed0954f0fdc2f08c76f6b3f24f44f0388a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Make it possible to mark a test as non-batchableMikolaj Boc2022-08-261-2/+2
| | | | | | | | This is useful in some cases where extra parameters have to be set on the test target. Change-Id: Ic727fdaf0bc9c2e1c684d1a86352d31c0f974477 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Place test helpers in batched test output directory unless overriddenMikolaj Boc2022-08-261-1/+8
| | | | | Change-Id: Ica209d10773d1acc38c3bad934cb53856e6a6c2a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Make qt_internal_test_batch_target_name publicly availableMikolaj Boc2022-08-251-7/+3
| | | | | | | | The batch test target name is a useful thing to obtain in various target-generating scripts. Change-Id: I9605cf860fe1485e48108eba7e93f9064209d8fb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Implement the batch_tests featureMikolaj Boc2022-08-241-52/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | An approach of test batching (joining multiple tests into a single binary) has been taken, due to long linking times/binary size on certain platforms, including WASM. This change adds a new feature 'batch_test_support' in Qt testlib. Based on the value of the feature, test batching may become enabled with the -batch-tests switch. Batching works for every target added via qt_internal_add_test. When first such target is being processed, a new combined target for all of the future test sources is created under the name of 'test_batch'. CMake attempts to merge the parameters of each of the tests, and some basic checks are run for parameter differences that are impossible to reconcile. On the C++ level, convenience macros instantiating the tests are redefined when batch_tests is on. The new, changed behavior triggered by the changes in the macros registers the tests in a central test registry, where they are available for execution based solely on their test name. The test name is interoperable with the names CMake is aware of, so CTest is able to run the tests one by one in the combined binary. Task-number: QTBUG-105273 Change-Id: I2b6071d58be16979bd967eab2d405249f5a4e658 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-231-1/+1
| | | | | | | Task-number: QTBUG-105718 Change-Id: I5d3ef70a31235868b9be6cb479b7621bf2a8ba39 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* CMake: Move _qt_internal_create_command_script to a public fileAlexandru Croitor2022-08-171-95/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | It's needed for creating qmake build tests. CMake / CTest has a limitation of not allowing to create single-config tests when using a multi-config generator using the add_test(NAME) signature. Using add_test(NAME) forcefully creates per-config tests, which means that it's not possible to just run ctest to execute tests, without specifying a -C parameter, which we do in the CI. qmake tests need to use the add_test(NAME) signature to specify the WORKING_DIRECTORY option. Because of the above limitation, a work around is to not use the add_test(NAME) signature, but instead delegate the working directory assignment to a generated cmake script, which _qt_internal_create_command_script can already do. Pick-to: 6.4 Task-number: QTBUG-96058 Change-Id: I6f439165994671724157f0edb7a71e351271e329 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* CMake: Enable public executable finalizers for iOS testsAlexandru Croitor2022-08-151-0/+15
| | | | | | | | | | | | | | | | | | | | | | This ensures that tests can be executed on the simulator or device, by doing the necessary steps like setting a bundle identifier, Info.plist file, launch screen, etc. This is done by calling _qt_internal_finalize_executable in the implementation of all internal test adding functions. The finalizers are limited only to iOS for now, as an incremental step, and to ensure we don't accidentally break tests on other platforms. At least WebAssembly uses its own finalizers which would likely cause duplicate calls if the _qt_internal_finalize_executable was unconditional. Pick-to: 6.4 Fixes: QTBUG-104754 Change-Id: I729d56385dd206b22c975fc2ce4e2c683e6e4e2c Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* CMake: Tests on iOS must be app bundles to be runnableAlexandru Croitor2022-08-151-0/+14
| | | | | | | Pick-to: 6.4 Task-number: QTBUG-104754 Change-Id: I05053d0f242f45e56e7a95ac75f5ef63ca8a5e0e Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add license headers to cmake filesLucie Gérard2022-08-031-0/+3
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I3b98cdc55ead806ec81ce09af9271f9b95af97fa Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* CMake: Deprecate _add_app/executable/test/tool PUBLIC_LIBRARIES optionAlexandru Croitor2022-07-291-4/+13
| | | | | | | | | | | | | | | | | | | | | | | Warn projects not to use it because PUBLIC_LIBRARIES don't make sense for executable targets and it also led to some issues in the internal functions where some of them did not expect to receive PUBLIC_LIBRARIES. To ensure builds don't needlessly break, treat PUBLIC_LIBRARIES values as regular LIBRARIES. In the future we might add an error instead. Using PUBLIC_LIBRARIES in qt_internal_add_app, etc, accidentally worked because the option name and the values following it were parsed as values of the "previous" option, like SOURCES or INCLUDE_DIRECTORIES or LIBRARIES, and when those got passed through to qt_internal_extend_target, things magically worked. We have a lot of projects using PUBLIC_LIBRARIES, mostly due to the way qmake pro files were written and how pro2cmake converted them. We'll have to clean up each repo. Change-Id: I69e09d34afdf98f0d47c08d324643fc986f8131c Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* CMake: Fix typosKai Köhne2022-06-131-2/+2
| | | | | | | | Found by codespell Pick-to: 6.4 Change-Id: I4907e423b6b345acf82f2d7e0ed62479719d694e Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Adjust installing and running wasm-testrunnerDavid Skoland2022-05-271-2/+11
| | | | | | | | | | Added a small helper function that also installs the script to prefix builds. Additionally, leveraging the cmake option CROSSCOMPILING_EMULATOR for the testrunner fits neatly in the rest of our cmake code. Change-Id: I75288e97c81b250ac3997f2e7a22bc7bd82b7b69 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add WASM testrunnerDavid Skoland2022-03-311-0/+3
| | | | | | | | | Add a python script that allows us to run wasm tests in CI, along with the necessary cmake logic to install the script and execute tests accordingly. Change-Id: I93b95c115538c4e27b2b833405acab8162be2a8a Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* CMake: Fix handling of the CROSSCOMPILING_EMULATOR propertyJoerg Bornemann2022-03-251-2/+3
| | | | | | | | | CROSSCOMPILING_EMULATOR is a target property, not a test property. Fixes: QTBUG-87864 Pick-to: 6.2 6.3 Change-Id: Icb07e9ed71a6bcbfceb7aa2116bf56eaa0a545c6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CI: QNX qemu need docker service ports explicitly defined for visibilityPasi Petäjäjärvi2022-03-211-0/+2
| | | | | | | | | | | | Network autotests cannot connect to services on docker containers from QNX qemu without all ports explicitly defined (both host and container) side. Pick-to: 6.2 6.3 Task-number: QTQAINFRA-4684 Change-Id: Iba44cfa17d42d43ecec3e29985e404f75d5fc232 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
* build system: support module local definitionsFabian Kosmale2022-03-111-0/+5
| | | | | | | | | | | | | | | | | | | This introduces a new helper function, qt_internal_add_repo_local_defines and makes use of it in qt_internal_add_{module,test,executable,benchmark,plugin}. That function checks whether QT_EXTRA_INTERNAL_TARGET_DEFINES is set. If it is, the defines listed in there will be aded to all targets passed to the functions mentioned above. The intended usage is that QT_EXTRA_INTERNAL_TARGET_DEFINES gets set in the repository local .cmake.conf. This allows e.g. opting in to source incompatible changes in leaf modules (as long as those are guarded by some define). Pick-to: 6.2 6.3 Fixes: QTBUG-101640 Change-Id: I06c3693ee69f46e95a48de724621f0c97e7cc3a8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Add BUILTIN_TESTDATA option to qt_internal_add_testAlexey Edelev2022-02-111-4/+31
| | | | | | | | | | | Multiple tests use qt_internal_add_resource that copies the functionality that is already implemented inside the qt_internal_add_test function. Simplify these test by replacing the qt_internal_add_resource call with the new BUILTIN_TESTDATA option. Change-Id: I18475b817d6f87264f0de53817d6c26c5ccab4e2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix the run of _check targets in multi-config buildsAlexey Edelev2022-02-091-2/+8
| | | | | | | | | | | With Ninja Multi-Config generator it's necessary to provide the '-C' option matching the build configuration when running ctest. This patchset adds the missing option to the command line of the '_check' targets. Pick-to: 6.2 6.3 Change-Id: I42acfba26a09877a6d3a5be9230860f15f95a0cd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add qt_internal_undefine_global_definition functionAlexey Edelev2022-02-021-8/+4
| | | | | | | | | | | | | | | | qt_internal_undefine_global_definition disables an internal global definition that is defined by the qt_internal_add_global_definition function for a specific target. Remove the ability to set the custom "undefine" flag for the definitions since it's hard to control it using the introduced function. Pick-to: 6.2 6.3 Task-number: QTBUG-100334 Change-Id: Ic1637d97aa51bbdd06c5b191c57a941aa208d4dc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Use builtin test data on IntegrityAlexey Edelev2022-02-021-1/+1
| | | | | | | | | Looks like Integrity doesn't deal well with external test data either. Pick-to: 6.3 Change-Id: I8beb5ac4d2440d40a7efdceae973e430a2354e9d Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Restore missing Qt definitionsAlexey Edelev2022-01-311-0/+17
| | | | | | | | | | | | | | | | | Restore the 'QT_NO_JAVA_STYLE_ITERATORS' and 'QT_NO_NARROWING_CONVERSIONS_IN_CONNECT' definitions for Qt targets. Add the function that adds global definitions for Qt targets according to the provided scope and the target property-based switch to disable the definition for a specific target. Pick-to: 6.2 6.3 Task-number: QTBUG-100295 Change-Id: I28697e81f9aabc45c48d79aae1e5caea141e04e1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
View Lorry Controller Status