summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog for 1.24.1v1.24.11.24Christian Kandeler2023-01-271-0/+9
| | | | | Change-Id: I7cd0a918d8dcabb2c98b7b801e46b7eb950adfcd Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* CMake build: Limit hack for CMake < 3.18 to CMake < 3.18Eike Ziller2023-01-241-1/+3
| | | | | Change-Id: I513f1b5fb9730639962a9a123f77525cd552211c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* IAR: Fix compiler macros and include paths retrievalChristian Kandeler2022-12-241-0/+2
| | | | | | Written-by: Denis Shienkov <denis.shienkov@gmail.com> Change-Id: I2a11dcd11a98300035ccac8d5872d15f46d18299 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Bump versionChristian Kandeler2022-11-281-1/+1
| | | | | Change-Id: Ib9b0af57a56c891f6e97d21d7da3fd4c7b6120b5 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* macos: fix support for Macos Venturav1.24.0Ivan Komissarov2022-11-121-1/+3
| | | | | | | The lsregister tool takes path to a bundle, not a name. Change-Id: I9093bab53586dc66d2854cd02271b1402fb33ac5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: Bump Xcode versionIvan Komissarov2022-11-021-19/+20
| | | | | Change-Id: I490133c1c4b25752142f2b82a9878394cad1b885 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add public bundle.useBuiltinXcodeBuildSpecs propertyIvan Komissarov2022-10-292-2/+15
| | | | | | Change-Id: Ib630bc08565527ee648c803f83d4dc9513410b7e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: print all threads on crashIvan Komissarov2022-10-271-1/+1
| | | | | Change-Id: I3c72d98147ebe4b4d61512a87c9bc72effe6b431 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: select default xcode before running testsIvan Komissarov2022-10-271-0/+8
| | | | | | | | | | | | | | | Some tests, such as TestBlackbox::minimumSystemVersion or TestBlackbox::emptyProfile use the default Xcode version instead of the one specified by the profile. This leads to fails of those tests with very old/new xcode versions. Fix that by making sure that the default Xcode is the same as the one specified via profile. Change-Id: I6d741ece7924d836c1fc66b496fe135bb47de72e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix TestBlackboxApple::assetCatalogIvan Komissarov2022-10-261-34/+5
| | | | | | | | | | The test hasn't been updated for a long time and 10.10 is not a a valid target anymore. Also, remove dead code for supporting ancient macos and xcode versions. Change-Id: I67b27fb6b0d1ce81c394441a51e966239994af92 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Workaround for the XCode 14 bugIvan Komissarov2022-10-251-3/+10
| | | | | | | | | | | It may happen that string is expanded to the the previously seen string via env: in {"FOO":"$(FOO$(BAR:identifier):default=YES)"} FOO refers to itself. Fixes: QBS-1711 Change-Id: I837a0dd2a9f08d9934dd20b1bff5576a53d84db6 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix test-qbs.shIvan Komissarov2022-10-251-1/+1
| | | | | | | This amends 545cfcc92fc5bb4fc7280abf4f7aad543de18985. Change-Id: I18f6d006c03d8aaad84c0feadb3c98dc9dde0c7c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qbspkgconfig: Fix dependency name mappingIvan Komissarov2022-10-241-3/+5
| | | | | | Change-Id: I4ed80de3b0186154b2c59587f30321912ccaa655 Fixes: QBS-1709 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix handling multiple dots in qbspkgconfig providerIvan Komissarov2022-10-246-1/+26
| | | | | | Change-Id: I91be4d90abb34f2007cebe4404204a9536d950c4 Fixes: QBS-1708 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: Do not run tests in parallelIvan Komissarov2022-10-241-9/+3
| | | | | | | | xargs parallel behavior is weird and it does not propagate child process errors (at least, on macos). Change-Id: I9571c0c689ee92f8852e942720ffaeb0f9de2579 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* JSON interface: Bump API levelChristian Kandeler2022-10-192-2/+2
| | | | | | | Amends a29bbf5568bf651b076f051720a98e9d0297faa9. Change-Id: Iac343ad2b77a8373fa1f02c98005c556bc04e7fc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Add changelog for 1.24.0Christian Kandeler2022-10-181-0/+12
| | | | | Change-Id: I77199da4b5dd6f9a955d0512180f915584e97e39 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Qt support: Bump minimum Windows version for Qt >= 6.2Christian Kandeler2022-10-171-0/+2
| | | | | | | | As was done for qmake and cmake; see qtbase/7c713c4d2c176dbc4fa7eb0a670aa86e49f36716. Change-Id: Ice75d4e6772d7a2ec0ad7db54900c8f61c8f4206 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Github actions: Update mingwChristian Kandeler2022-10-144-8/+31
| | | | | | | | | 8.1 has a bug that we run into when compiling quickjs (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86048). Change-Id: I1df7e7f3e2e0d39f44d1c8636f74c3333167db0d Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix TestBlackboxQt::staticQtPluginLinking()Christian Kandeler2022-10-141-2/+2
| | | | | | | Amends c1af290c995ef9791731fa59fdb7d24443c6b035. Change-Id: I7644ed94fa15161ee50b32dede2d5d05a7a64998 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix possible crash in ExecutorChristian Kandeler2022-10-141-2/+4
| | | | | | | Amends d8d7beb866b24793d9c04b6996276a4a8959bfa2. Change-Id: I6eefff5640ad1213e2ae36d7f71ba476ea4d475b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Do not use QString::count()Christian Kandeler2022-10-142-3/+3
| | | | | | | It's deprecated in Qt 6.4. Change-Id: I8daa6fc7fffbe80938dd3cc64168bfd9471f85f4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* 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>
View Lorry Controller Status