summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* pro2cmake: Adjust script to generate new CMake API callsAlexandru Croitor2019-11-141-15/+124
| | | | | | | | | | | | | | | | | | | | | | | | The script can now generate both old style CMake API calls (add_qt_module), as well as new style (qt_add_module). The first case is considered api version 1, and the second case is version 2. You can force which api version to use for generation using the --api-version command line argument. This is useful when you want to regenerate an old project (one that hasn't switched to new style), to keep the diffs easier to read. When no parameter is specified, the script will auto-detect which api version is used in the existing CMakeLists.txt file (if it exists), and keep using that, until someone force regenerates the project with a new api version. Change-Id: I41e4e6ed5db94ef7220c09b46fc5f12e6613e5d2 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate src/*Alexandru Croitor2019-11-14136-1000/+999
| | | | | | Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Rename / prefix all our private API functions with qt_Alexandru Croitor2019-11-146-137/+194
| | | | | | | | | | | Rename internal APIs like extend_target to qt_extend_target. Prefix apis with qt_ where required. Keep old names for compatibility until all their usages are removed. Change-Id: I9a13515a01857257a4c5be3a89253749d46a4f41 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* pro2cmake: Allow limiting the number of projects to convertAlexandru Croitor2019-11-141-0/+17
| | | | | | Change-Id: I7c06d530cb98cc07e4a618427a7cf7b5c70aa171 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Convert all of tests/manualLeander Beernaert2019-11-14144-97/+3245
| | | | | | | Fixes: QTBUG-78164 Change-Id: I28b59bf84533fc33fafafd1511b5337d36af0e2b Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix not to add warnings_are_errors property to INTERFACE targetsAlexandru Croitor2019-11-131-0/+4
| | | | | | | | | Amends f00068561287e64c8c664ee1af3feff08b22b669 Change-Id: I3b61b64bb9c755de38f4a5ffcb07b39b38bd4fd7 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* pro2cmake: Fix generic_version_handler not to be greedyAlexandru Croitor2019-11-131-1/+1
| | | | | | | | | Otherwise in a condition with multiple comparisons, the regexp would match too many characters, and not extract the correct variable name. And to be extra safe, match until a comma is encountered. Change-Id: I29d8344287efca5c5b232006f6bbdf39e6e4ee67 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix build for tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobjectLeander Beernaert2019-11-131-0/+1
| | | | | Change-Id: I9c793e38b89cc00c8835bdcf85e9ab0b714da1c8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Regenerate qtbase tests and src/* for some small fixesAlexandru Croitor2019-11-1311-22/+12
| | | | | | Change-Id: I049829492971875a5c5ff159104707d9e2ad1e46 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/testlibAlexandru Croitor2019-11-13114-755/+42
| | | | | | Change-Id: If1b2e105836b73b1a68ed5a8e11feb8e114d66e2 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Allow passing args from run_pro2cmake to pro2cmakeAlexandru Croitor2019-11-131-3/+18
| | | | | | Change-Id: Ic874d4cd3488903ffec438f5c127b589e6371f7a Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* pro2cmake: Reformat code with blackAlexandru Croitor2019-11-132-1/+5
| | | | | | | Change-Id: I699031d4a05dad84a0807039dcdba17fd5acf2e3 Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* pro2cmake: If CONFIG-=app_bundle consider this a non gui appAlexandru Croitor2019-11-131-1/+1
| | | | | Change-Id: I45804af3c43cf1af8b00ac3542e045fe697bf1b6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/sqlAlexandru Croitor2019-11-1313-13/+136
| | | | | Change-Id: If411b1e7c3a7cb58922e5a48309f42ba29f2c068 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/printsupportAlexandru Croitor2019-11-134-4/+10
| | | | | Change-Id: I517adae77f7a5851b07fa660732318c175570fb9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/otherAlexandru Croitor2019-11-135-0/+135
| | | | | Change-Id: Ib1753d1869f5af1900fbeaf2e95d3160cf979ca8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/openglAlexandru Croitor2019-11-134-8/+72
| | | | | Change-Id: I9bd417ae02db1b6827e09baab301152f3614da80 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/dbusAlexandru Croitor2019-11-1326-51/+120
| | | | | Change-Id: I105eb73065e02a4fa508d17f481047b32875f128 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/concurrentAlexandru Croitor2019-11-138-9/+37
| | | | | Change-Id: I6a291f7dd70f78c5cafb6d96a1c0d57ed7223c8b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/network/sslAlexandru Croitor2019-11-1314-77/+27
| | | | | Change-Id: Ib05f4e3c8dea934ce48776fdd50305f7c98c1adb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/network/socketAlexandru Croitor2019-11-1314-35/+69
| | | | | Change-Id: I653f7f4a6e3421f56f873cfbec4309eca49f1756 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/network/bearerAlexandru Croitor2019-11-135-17/+1
| | | | | Change-Id: I57526fa99376708203fb1723f3b85243925a1273 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/network/accessAlexandru Croitor2019-11-1315-51/+34
| | | | | Change-Id: I18839ef583336fa2fa42cb4325fdb007675df213 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/network/kernelAlexandru Croitor2019-11-1310-35/+10
| | | | | Change-Id: I770fce0f0a369204178ea0dfa7bbd8b210dd3585 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/widgets/utilAlexandru Croitor2019-11-135-5/+72
| | | | | Change-Id: Icda122f04c8857f237e822d3981befb78885309b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/widgets/graphicsviewAlexandru Croitor2019-11-1318-35/+302
| | | | | Change-Id: I2e6a8f2f92e9cb8d6bb0be53068dfd43ba87db4c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/widgets/itemviewsAlexandru Croitor2019-11-1316-38/+244
| | | | | Change-Id: Ia95c89cde7faf5d3edb69cc8969bda2becd7b51d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/widgets/stylesAlexandru Croitor2019-11-133-5/+63
| | | | | Change-Id: I8c9a63d0ac33465db832f01e1dd84abbea66fb30 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/widgets/kernelAlexandru Croitor2019-11-134-1/+79
| | | | | Change-Id: Ib611ea32623e44c58432a15c73626aab36ab2b98 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/widgets/effectsAlexandru Croitor2019-11-132-4/+26
| | | | | Change-Id: Ib31f764202635198b5cdf236ba19982bb3b18cbb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/widgets/dialogsAlexandru Croitor2019-11-1312-38/+145
| | | | | Change-Id: Ief296935d274bfaa217442890927593f0875271a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/widgets/widgetsAlexandru Croitor2019-11-1348-80/+719
| | | | | Change-Id: I9d9360612931b29b5d13a224236ef650dc5c8e1d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate rest of tests/auto/guiAlexandru Croitor2019-11-133-2/+27
| | | | | Change-Id: Iaaea50790161715517f7a4085116d5c893fa286b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/gui/math3dAlexandru Croitor2019-11-133-5/+36
| | | | | Change-Id: I7579ed464ec9211b1da7478c02e4e13a2a71277a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/gui/kernelAlexandru Croitor2019-11-136-10/+48
| | | | | Change-Id: I32046f33612f9b306dd889a0d42aa70d32375531 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/gui/paintingAlexandru Croitor2019-11-135-5/+62
| | | | | Change-Id: Id30f9e7e6cadb4a09c669c5688c01a84300a8c41 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/gui/imageAlexandru Croitor2019-11-135-88/+92
| | | | | Change-Id: If6aa42d5b19227e488fc2fcf94b8eacc02c2c209 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* pro2cmake: Fix broken is_manual_test usageAlexandru Croitor2019-11-131-2/+2
| | | | | | | | Amends 681e8b4ead432b2658b0be9f90454bbdbd80d1b1 Change-Id: I5ac8761de10d945b6ac78ba95a179209c80cb893 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Always build tests by default when building standalone testsAlexandru Croitor2019-11-131-0/+4
| | | | | | | | Amends 021c17c62f963a682c6a4b19f0c3d362c28a97ee Change-Id: I8181270ef7506eb5da4d3b43e105e100ed5581e4 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Don't include standalone tests config file if none existsAlexandru Croitor2019-11-131-1/+1
| | | | | | | | | | | Some repos like qtimageformats don't generate a config file for standalone tests because the repo creates no modules. Amends de3a806def4b9a754825a2233c9d4952a9b2d0eb Change-Id: Id42338804605a883f975feb5dd81eda5acc6e687 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix qt_skip_warnings_are_errors_when_repo_unclean for executablesAlexandru Croitor2019-11-131-1/+1
| | | | | | | | Amends f00068561287e64c8c664ee1af3feff08b22b669 Change-Id: I48d7a42e11e609fa3a387b7669ee96bd10c856e4 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add support for skipping warnings are errorsAlexandru Croitor2019-11-122-9/+27
| | | | | | | | | | | | | | | | | | | Unfortunately not all repositories are marked as warning_clean in their .qmake.conf files. For instance qtconnectivity and qttools are not warning clean. Therefore we need to skip warnings_are_errors flags on all targets created in that repository. Add support for skipping the warnings are errors flags, by setting a QT_SKIP_WARNINGS_ARE_ERRORS property on a target, and use that within a generator expression with all the accumulated flags. To mimic behavior of qmake, and set the property on all targets created by add_qt_module, add_qt_plugin, etc, one simply needs to set the QT_REPO_NOT_WARNINGS_CLEAN variable in the repo project CMakeLists.txt. Change-Id: Ib5a487af6601ae1519a0988a89f8083f94f92267 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Revert "Fix static linking when using bearer plugins"Alexandru Croitor2019-11-122-0/+2
| | | | | | | | | | | | | | | | While the first patch that was required to fix duplicate symbols errors was merged from dev to wip/cmake, the second one 7a605edc226d4051602e157fe575f17dfaac0964 is not yet merged. So revert the revert to temporarily fix static builds until we do another merge from dev to wip/cmake. This reverts commit 307cd64c5726f93dbc91cafbce986875a6cce3e1 Task-number: Fixes: QTBUG-79211 Change-Id: I72052513fc0e0183b3ce8270b4ce3f2ff44b664d Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate everything under ./srcAlexandru Croitor2019-11-12116-148/+0
| | | | | | | Change-Id: Ibdbdc17f8c2ee41356f490dd839a47e1bcf4c586 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Regenerate tests/auto/corelib/statemachineAlexandru Croitor2019-11-121-1/+10
| | | | | | Change-Id: I9b9dcb0ede68116033bcde69cc1b5fafb67a22d1 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Regenerate tests/auto/corelib/serializationAlexandru Croitor2019-11-125-29/+31
| | | | | | | Change-Id: Id2e221e4018b46467203c8d6f29a9758c3c57a60 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Regenerate tests/auto/corelib/codecsAlexandru Croitor2019-11-122-2/+21
| | | | | | | Change-Id: Iea71e497e8bcf131ed89c9e576381dc305b1dd44 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Regenerate tests/auto/corelib/toolsAlexandru Croitor2019-11-1229-38/+296
| | | | | | | Change-Id: I1ea8fbf509c7e6d556ebd974fcff9084bc668e17 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Regenerate tests/auto/corelib/mimetypesAlexandru Croitor2019-11-125-68/+184
| | | | | | | Change-Id: Id137b8e9f48edd65c4df901f11a8ae917395d6b6 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Regenerate tests/auto/corelib/textAlexandru Croitor2019-11-1213-13/+128
| | | | | | | | Change-Id: I34e24b7c2697bcdddc628855e2b539b8db1b98b0 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Qt CMake Build Bot
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 04:49:53 +0000