summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add FindWrapHarfbuzzAlexandru Croitor2019-11-253-2/+47
| | | | | | | | | | Apparently we didn't have a wrap find module for it before. Add one, and add special support to handle a Gentoo broken Config file which is exported by an autotools build of harbuzz. Change-Id: I83cbeb817caf2610104c16713d4eac6ab6f8c63b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Add support for DYNAMIC_QMLDIR to pro2cmakeLeander Beernaert2019-11-251-50/+134
| | | | | Change-Id: I95575dc352343ec86a6f7cacd7b49521262a9a7a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix formatting in helper.pyLeander Beernaert2019-11-251-5/+9
| | | | | Change-Id: I8ee2abd27064bfc5bf3f291c2743570d11227fcf Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix pro2cmake formattingSimon Hausmann2019-11-232-15/+12
| | | | | | | | | ... by running make format. Change-Id: I523a48abd2c483107f5c16c24daa695fcc0a55e5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Qt CMake Build Bot
* Add parts needed for QtQuick3DMårten Nordheim2019-11-223-6/+29
| | | | | | | | | | | There is a patch in progress to add mappings for Qt3D, so reuse the old broken Qt3D mappings, delete the duplicates. QtOpenGLExtensions is needed, so this patch includes it. Change-Id: I27896ee88b9e6873c8cd52d86afc330e309e1e14 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* CMake: Do feature testing for linker flagsCristian Adam2019-11-221-3/+16
| | | | | | | | | Instead of hardcoding which platforms and which compilers support certain linker features, do the proper probing via check_cxx_source_compiles. Change-Id: I676010970d8f3a8f2a8340c5d15dfcef76fe9191 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Add support for building with Clang-MinGW toolchainCristian Adam2019-11-221-2/+5
| | | | | | | | Clang doesn't have a mkspec just a win32-clang, there is win32-clang-g++ and win32-clang-msvc. Change-Id: Iff521e955559dfb2308e377b41e86b3f62c42e70 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix an incorrect regex rangeJean-Michaël Celerier2019-11-221-2/+2
| | | | | Change-Id: I1b8b72cb4adcd872a3e4c245e58d4e302bf00c86 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix warnings when a module's plugin type has underscoresAlexandru Croitor2019-11-151-3/+9
| | | | | | | | | | | | | | | | In qtwayland, there were a bunch of warnings of the following type when configuring: "The plug-in 'f' does not belong to any Qt module". This happened because the plugin type had underscores, and was not sanitized when comparing a the plugin type of plugin. Add a function to do the sanitization, and use it everywhere. Change-Id: I728b5f1e18fa5f8876c4a57dbd4e33148cb242d5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Fix add_cmake_library to use a correct plugin suffix on macOSAlexandru Croitor2019-11-151-0/+6
| | | | | | | | | | Qt plugins on macOS use .dylib, whereas CMake created used ".so" instead. Change-Id: I3ea73a52a0675a0cfce4997ca413df79e63cfaa7 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Add more special condition conversionsLeander Beernaert2019-11-141-0/+11
| | | | | | | | Handle conversions for QT_NO_CURSOR, QT_NO_TRANSLATION and qtConfig(opengles.). Change-Id: Idd930f77e78f235b7997a5083ac7faf630ed9801 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 00:49:00 +0000