aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make handling of deprecated items and properties configurableChristian Kandeler2022-10-0437-79/+448
| | | | | | | | | | | | | | | | | | | As of now, a newly deprecated property leads to users getting bombarded with warnings, even though they did not yet have a chance to adapt their project. Now the warnings appear by default one minor version before removal, which together with our convention of keeping deprecated properties for at least two minor versions gives users enough time to adapt without getting spammed. There is also a mode for switching to the previous behavior (for early detection), as well as the possibility to trigger errors instead of warnings, which should be helpful in CI configurations. To support the case where the user cannot do anything about them, the warnings can also be suppressed altogether. Change-Id: I295f816758f0f111fcb0351581a4328be3af5668 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Fix freedesktop moduleChristian Kandeler2022-09-211-5/+3
| | | | | | | | | | | QML ids are a file-scope thing and should only be used where it's absolutely necessary. In this case, the module only worked because of a bug in our evaluator, which often has too many things in scope. Change-Id: Idb581f21be3a9145f5a899cab4d64d6e6cfbfbae Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Take into account qbs module props used by providers when cachingIvan Komissarov2022-09-168-9/+125
| | | | | | | | Otherwise, we end up with wrong modules used by products that override qbs module props such as sysroot. Change-Id: Id5a74e8198217e737fb02a506ac7a9bb216b4d60 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qbspkgconfig: fix sysrootIvan Komissarov2022-08-294-16/+22
| | | | | | | And also use exporterd .pc file and sysroot in the test. Change-Id: I54bda75f57bdf36fcb054de9aaf71c313b8626e3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: fix macos runner nameIvan Komissarov2022-08-291-2/+2
| | | | | | | | It's macos-11, not macos-11.0, see https://github.com/actions/runner-images Change-Id: I336faf2c055a8b63b0fd0e1b0af8c4224f42dc2c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update clang and clang-tidyIvan Komissarov2022-08-253-208/+10
| | | | | | | clang-8 fails to compile Qt 6 code, so update it. Change-Id: Ib0d25c961738ec7549856366b27ef62f87cb910d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* clang-tidy: fix modernize-avoid-bind errorIvan Komissarov2022-08-251-1/+1
| | | | | Change-Id: I30ac4a612e527a9dd4d1ab4d714635d178767caf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: also run iOS tests with XCode 13.4.1Ivan Komissarov2022-08-241-1/+1
| | | | | | | This amends 1f751bf3ee3d14d9018b14528100238d018e9f2e. Change-Id: I03580e3ad22bc8d4c76565389980f74bb6aa97d6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Darwin: Set NSSupportsAutomaticGraphicsSwitching to true by defaultIvan Komissarov2022-08-242-0/+4
| | | | | | | | | | User can set it to false using the bundle.infoPlist property if needed. Fixes: QBS-1670 Change-Id: Ie009bd7f366c09ae6a77134ba0290dea62ae6e35 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* clang-tidy: fix 'modernize-loop-convert' errorIvan Komissarov2022-08-231-2/+2
| | | | | Change-Id: Ia47ad4ed3e6d3f5067e8b32268185092f38c26c0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* clang-tidy: fix 'performance-implicit-conversion-in-loop'Ivan Komissarov2022-08-233-7/+7
| | | | | Change-Id: I7ca65f27fb30326e6013925a23e0a78ef1de7a5e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* clang-tidy: fix 'bugprone-branch-clone' errorIvan Komissarov2022-08-231-2/+1
| | | | | Change-Id: I7eb5247a8c900cbde95408c7184ef2ecfa5d02cd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: do not fail Windows buildsIvan Komissarov2022-08-221-0/+1
| | | | | | | ... if pkgconfiglite fails to install. Change-Id: If4999bdf032f55015fe3fb17ffb229ac570c91e7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: use XCode 13.4.1 instead of 13.4Ivan Komissarov2022-08-221-3/+3
| | | | | Change-Id: Ia630278077856643a07c0b7671f6b048e4720342 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Add release instructionsIvan Komissarov2022-08-221-0/+105
| | | | | Change-Id: I8ab0178ac5611ac739dc040e01c049d65d458a68 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* fix run-analyzer.shIvan Komissarov2022-08-221-1/+2
| | | | | Change-Id: I30636c75d316b705924226f8883dc648ddc54e38 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Minor refactorIvan Komissarov2022-08-223-31/+32
| | | | | | | | | | Make module provider methods have similar signatures. Also, rename methods to avoid confusion with what they actually do. Change-Id: I8a905667f8f583537837d26c07ba62f093709997 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge branch '1.23' into masterIvan Komissarov2022-08-229-17/+44
|\ | | | | | | Change-Id: I1640aa670bd12be70b794286deda4d420bb491df
| * GitHub actions: do not install pkgconfig into baremetal testsv1.23.21.23Ivan Komissarov2022-08-211-2/+0
| | | | | | | | | | Change-Id: I48238045173213a48f64ec4f047fd3a9d3ad63ea Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * GitHub actions: Fix install-ow.shIvan Komissarov2022-08-211-5/+6
| | | | | | | | | | Change-Id: I76cbafa8c0eaf8c6d48c6d1a4c2cd4ba8c9215c6 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * Add changelog for 1.23.2Christian Kandeler2022-08-191-0/+10
| | | | | | | | | | Change-Id: Ib747e824dd56b0fb0debbbecf37a3a61cac367ec Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * Qt support: Add define required for MSVCChristian Kandeler2022-08-181-0/+2
| | | | | | | | | | | | | | See qtbase/0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e. Change-Id: I2ec73eb699a8f3a4cca9bb9091534b51bb578ae6 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * cmake: some cleanupIvan Komissarov2022-08-151-2/+0
| | | | | | | | | | Change-Id: I2d64beeb48370cd51c87c7dff835451f89ae04c4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * doc: fix types in Host serviceIvan Komissarov2022-08-151-4/+4
| | | | | | | | | | | | | | This amends 54ec5e8851f0573beb466ddec2e20a1f3c2b7f7a. Change-Id: Ie2b5d7fa18b2df1776e8c33ab84c6e3c72322a2a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * cmake: allow to specify html dir nameIvan Komissarov2022-08-152-1/+2
| | | | | | | | | | | | | | Required for MacPorts. Change-Id: I0ed3e6ddb0414669fccc8102e228631040b1fbb7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * cmake: fix installing documentationIvan Komissarov2022-08-152-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HTML documentation was not installed if QCH doc was not requested, fix that. Introduce a new 'qbs_docs' target which should be used instead of the 'BuildQbsDocumentation' target. This is done for compatibility with QMake. Also, introduce a single 'qbs_docs' component for installing docs in one go - this is required for MacPorts since there is no easy way to install multiple components at once with CMake. Which docs will be installed is controlled at the configure step: $ cmake -DQBS_INSTALL_HTML_DOCS=1 -DQBS_INSTALL_QCH_DOCS=1 -DQBS_INSTALL_MAN_PAGE=1 $ cmake --build . --target qbs_docs # not required for man-page only install $ cmake --install . --component qbs_docs Change-Id: I174662c54255a8fb10529b1961c298eb1f1b1470 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Bump versionIvan Komissarov2022-08-151-1/+1
| | | | | | | | | | Change-Id: I3ced9fc96742bd3acf246bea9e400a938180f71e Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * doc: Install man pages with cmakeMarius Gripsgard2022-08-113-0/+6
| | | | | | | | | | Change-Id: Ibce74cf1b524c8c08b38dfc76549b4723ea705b3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: fix 'performance-no-automatic-move' warningIvan Komissarov2022-08-1621-28/+25
| | | | | | | | | | Change-Id: I0fea777445be769080b5e5534eb8dd05cf4652be Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: fix 'performance-trivially-destructible' errorIvan Komissarov2022-08-162-3/+0
| | | | | | | | | | Change-Id: I8679408bca49076dc51c1ec06411c3b5f80f2764 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: add qmljsparser.cpp to the blacklistIvan Komissarov2022-08-151-1/+1
| | | | | | | | | | | | | | This file is autogenerated and shoould not be linted. Change-Id: Id82147666d0e1d5ea78387ef460b85aca45636bb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: fix bugprone-branch-clone in msp430generalsettingsgroup_v7.cppIvan Komissarov2022-08-151-2/+2
| | | | | | | | | | | | Change-Id: I317346e2fb87af2a64b5405715c7ac1961d9c9bd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | clang-tidy: fix bugprone-branch-clone in stm8generalsettingsgroup_v3.cppIvan Komissarov2022-08-151-2/+2
| | | | | | | | | | | | Change-Id: I8c026b01e546bc25468c1852fbf0ec09f09c56aa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | clang-tidy: fix bugprone-branch-clone in executor.cppIvan Komissarov2022-08-151-4/+2
| | | | | | | | | | Change-Id: I3ca9909c4a9061132c245985c4fd738fb7bc3009 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: fix a couple of narrowing-conversions errorsIvan Komissarov2022-08-152-5/+5
| | | | | | | | | | Change-Id: Ie79769666203185fe52be5efb09c68336e84cbab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | clang-tidy: fix bugprone-branch-clone in mcs51generalsettingsgroup_v10.cppIvan Komissarov2022-08-141-35/+19
| | | | | | | | | | Change-Id: Ie7dedd5ff50a67452d377ce52c768d6a57ae44a8 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Qt support: Only pull in sanitizer module if it's neededChristian Kandeler2022-08-121-3/+1
| | | | | | | | | | | | | | We should not load the module unnecessarily into all Qt-based projects. Change-Id: I61a9b9eb74ea5f17d2080aa67894d839124d1dea Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | clang-tidy: fix configIvan Komissarov2022-08-111-2/+2
| | | | | | | | | | | | | | | | | | clang-tidy 12 complains that '0' is not a valid value, see https://releases.llvm.org/8.0.0/tools/clang/tools/extra//docs/clang-tidy/checks/modernize-make-shared.html#options Change-Id: Ice11a987b6e6e2eade19dfba1c090195565fd3c5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Update focal-qt6 image to Qt 6.2.4Ivan Komissarov2022-08-103-5/+5
| | | | | | | | | | Change-Id: I098072d593d927d52b56e06d48e3fbe018c072a4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | docker: make 'focal' a reference to 'focal-qt5'Ivan Komissarov2022-08-091-2/+5
| | | | | | | | | | Change-Id: I0a9421b379a0cb0288820aee43d4dcf7cbbae47a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | GitHub actions: enable sanitizer for the Qt6 buildIvan Komissarov2022-08-093-2/+3
| | | | | | | | | | Change-Id: I1222e7d9a49439d6f0067ae2b1e38da113bb3faa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add executableSuffix to the FileInfo serviceRaphael Cotty2022-08-0810-13/+28
| | | | | | | | | | Change-Id: I86c24c6ad1ea0daf298b71501a6719c8b2650c1c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | GitHub actions: Update Windows jobsIvan Komissarov2022-08-081-5/+5
| | | | | | | | | | Change-Id: I22bee562fd134ff128a73448ac06878cb2357811 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge branch '1.23' into masterIvan Komissarov2022-08-0627-60/+180
|\| | | | | | | Change-Id: I1b8380de724095c1befcf45d2850376ee0a4a78f
| * docker: install qdoc into Qt4 imageIvan Komissarov2022-08-052-3/+3
| | | | | | | | | | Change-Id: Ic0a05c8d97e77f441e6efdd1216715d2479cdb10 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * qbspkgconfig: fix handling empty variablesv1.23.1Ivan Komissarov2022-08-057-12/+51
| | | | | | | | | | | | | | | | | | | | Variables should be allowed to be set to empty values, only missing variables should produce errors. Fixes: QBS-1702 Change-Id: Ib9aac611a578a3673fb8201099a707e5842fd750 Reviewed-by: Kai Dohmen <psykai1993@googlemail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Fix passing linker scripts to iar and keil toolchainsIvan Komissarov2022-08-033-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Those toolchains expect separate parameters for linker script flag and script itself. This amends ff04acd64d85d460e0f52a7ead233ae503e616d7. Fixes: QBS-1704 Change-Id: Icd7028be89457ea539b5edae9c572bffdad6d997 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Include qtscript into a tarballIvan Komissarov2022-08-032-1/+4
| | | | | | | | | | | | Fixes: QBS-1703 Change-Id: Idb33b9e2336c5b7fb7df37472fb6728ff06dd751 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Qt support: Adapt to change in location of the qhelpgenerator toolIvan Komissarov2022-08-033-2/+10
| | | | | | | | | | Change-Id: Idf4652963cca9e32bc086ea67fd7d4af6461ba17 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Fix setting up Qt 6.3 with qbspkgconfigIvan Komissarov2022-08-032-5/+6
| | | | | | | | | | | | | | The 'host_bins' variable was renamed to 'bindir'. Change-Id: Iab235ea7c5ba93d7c815470e432b293f7a06ab37 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 09:37:05 +0000