aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove useless code from grpc testHEADmasterIvan Komissarov3 days1-7/+0
| | | | | Change-Id: I9333a1ec4473a74d15cb71db841d2673ed992af2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix capnproto testIvan Komissarov3 days2-25/+12
| | | | | | | | | | | | Since the fallback provider is removed, we need to use qbspkgconfig instead. Also, fix call to 'qbs resolve' in order to skip test properly. Amends dfbef13214d78b6cc4a22376bed1329d5443ada2. Change-Id: Ida01286c5590e912aad6d30874eaa8ef53c35687 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update quickjs libIvan Komissarov7 days21-8854/+16214
| | | | | | | | | | | | On top of current master branch. The changes were gradually rebased on current master in our own fork in a branch https://github.com/qbs/quickjs/tree/qbs Some changes, like renaming of functions and macros were reverted as they do not make much sense. Change-Id: I8b8158de865ee41560ea627d506169b8b1993220 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge 2.3 into masterChristian Kandeler13 days5-17/+60
|\ | | | | | | Change-Id: I84781cbc6c277f1f7801c8a7e702a1241e308289
| * GitHub actions: Fix caching2.3Ivan Komissarov2024-05-132-14/+52
| | | | | | | | | | | | | | | | | | | | | | Removing timestamp was incorrect - if the cache key is the same as we restored from, the cache will not be uploaded at all. Amends ca74c524363d17c689bb0ec4ca39c744df8d036e. Change-Id: I53c32a5f4950c98b2be38fa2be8391e9870f1d6f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * GitHub actions: fix profile name for Xcode-less jobIvan Komissarov2024-05-131-1/+1
| | | | | | | | | | | | | | | | The profile name doesn't affect tests at all, but is confusing. Change to simply "clang". Change-Id: Ic77392b1ed0b113b6711dbc7e2a0a162817b22f2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Fix the linkerMode test for Linux ARMDmitry Shachnev2024-05-113-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Having ret instruction fixes the error with clang on macOS, but makes it fail on Linux on 32-bit ARM and some other architectures: tests/auto/blackbox/testWorkDir/linkerMode/main.s: Assembler messages: tests/auto/blackbox/testWorkDir/linkerMode/main.s:6: Error: bad instruction `ret' ERROR: Process failed with exit code 1. Amends e56cbf7b64810ca0fadc8d3ffbc92a5ba1b293a0. Change-Id: Ic50d99875cc62e420abc4f1183ff311d45bcf3eb Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | CommandLineParser: Be stricter about the use of build dir placeholdersChristian Kandeler2024-05-143-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | As of commit b6bf17cfd1cad7a673082e80896edec889809446, the path to the project file can be taken from an existing build graph, which is conceptually incompatible with the build directory placeholders feature. Rather than silently using an unexpected build directory, we now fail if a placeholder is used without an explicit project file path. Task-number: QBS-1327 Change-Id: Ibfa83c5764fd4f5a25b5c3b82a0c4cc385692cd5 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Merge 2.3 into masterChristian Kandeler2024-05-104-5/+5
|\| | | | | | | Change-Id: Ibfa0e6880a3da48c5fefa4a4ed3b0f450698d567
| * Fix typos in changelogsIvan Komissarov2024-05-082-2/+2
| | | | | | | | | | Change-Id: Ie9d0fac0a7eb6f34cba965b8c1c12a48f0a172cb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Bump versionChristian Kandeler2024-05-071-1/+1
| | | | | | | | | | Change-Id: I5e0f7f943b5160ea754fda8372d361bf858a6034 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * doc: fix links to ApplicationIvan Komissarov2024-05-062-3/+3
| | | | | | | | | | | | | | ...by renaming the Application page to Console Application. Change-Id: I192d3d3c65cd20019fb63b1309d564d4859f0aeb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | RulesApplicator: Do not auto-correct invalid artifact pathsChristian Kandeler2024-05-106-10/+58
| | | | | | | | | | | | | | | | | | If a rule tries to create an artifact outside the build directory, complain instead of (sometimes) silently changing it. Fixes: QBS-1268 Change-Id: I9b5e27cf01b01fd7d09254083279682888838f83 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Do not allow id properties in Module itemsChristian Kandeler2024-05-087-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | This file-scope QML construct is generally rather dubious in qbs, but we make it work in most contexts by injecting the id scope into e.g. the surrounding module instance. However, for modules itself this is not possible, and there we should prevent id usage altogether, rather than letting users run into weird follow-up problems. Task-number: QBS-1770 Change-Id: Ib3efca21e77758c22313d19afe60cd877be0d98a Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | clang-tidy: brings back 'google-readability-casting' checkIvan Komissarov2024-05-061-1/+0
| | | | | | | | | | | | | | | | Apparently, LLVM 15 doesn't check it properly and thus we can remove it back. Change-Id: I0fdc59a3ccdb8c4c57b6d23a3b19e3087b3ff983 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Remove 'parent' access from qbspkgconfig providerIvan Komissarov2024-05-031-8/+6
| | | | | | | | | | | | | | ...and remove unused variable. Change-Id: Iacad86eb238ad09adc610805d5fbb9585c5083d0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge branch '2.3' into masterIvan Komissarov2024-05-038-13/+26
|\| | | | | | | Change-Id: Idca4efc5d0b44ceab159a8a287e125c85b57ae29
| * Update changelogv2.3.1Ivan Komissarov2024-05-031-0/+5
| | | | | | | | | | Change-Id: Icedbd322ffd8bd6fbc69dde2ff27ff93d3308273 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * doc: fixes for PkgConfigProbeIvan Komissarov2024-05-031-5/+6
| | | | | | | | | | Change-Id: Ia8c0c51fad0a33d2e870c71d45868242e3a12238 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * GitHub actions: fix doc jobIvan Komissarov2024-05-031-3/+3
| | | | | | | | | | Change-Id: I9d462f5a960cf79ad6ffa8a74689a6e3e27d6425 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Qt: fix minimum macOS/iOS versions for Qt 6.7.1Ivan Komissarov2024-05-021-0/+7
| | | | | | | | | | Change-Id: I3338a3b6dbb669abab63f94c5ed9e9440a4de04d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * GitHub actions: fix macOS 14.2 jobIvan Komissarov2024-04-304-5/+5
| | | | | | | | | | | | | | ...by bumping minimum macOS version. Change-Id: I3097cacb6782d262e623bb16851f5d5cec616ee0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | tutorial: part 3Ivan Komissarov2024-05-0317-1/+362
| | | | | | | | | | Change-Id: I39b6a7ab3fc3ef54e144684d1ac115599b630759 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Use BinaryProbe in the pkgconfig providerRaphael Cotty2024-05-034-26/+23
| | | | | | | | | | | | | | | | This allows to re-use the code in the Probe rather than iterate over PATHS manually Change-Id: Ibc6da2b141329033ad1c3fc0f9f22a8170df74b3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge 2.3 into masterChristian Kandeler2024-04-2612-138/+193
|\| | | | | | | Change-Id: Ibcc502f9af2acce8b1b5949aa1ee7e33577a8ed3
| * Loader: Fix look-up of qbs properties from provider probesChristian Kandeler2024-04-223-2/+12
| | | | | | | | | | | | | | | | ... by setting the provider scope on the values instead of the item. Task-number: QBS-1742 Change-Id: I8084e3f8529335c3d045c057ba70a3c3b091efa6 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * GitHub actions: fix nodejs warningsIvan Komissarov2024-04-172-74/+38
| | | | | | | | | | | | | | | | | | | | | | Upgrade upload-artifact@ and chace@ actions. Don't use the timestamp for the cache anymore. Caches are unique for the branch anyway, no need to make them even more unique. Change-Id: Ia0decbb9450030fb28d6608de3ac6aea4eb25d14 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * apple: fix codesign moduleIvan Komissarov2024-04-174-54/+98
| | | | | | | | | | | | | | | | ... when multiplexing over build variants. Fixes: QBS-1775 Change-Id: If49e6b5f5282cec2c14de61a46a74e2621a46997 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Add 2.3.0 changelogIvan Komissarov2024-04-171-0/+37
| | | | | | | | | | Change-Id: I6aa65c6cd31baf9f8f4b72a9d66bdf2b82a1ab99 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * doc: fix links between pagesIvan Komissarov2024-04-082-2/+2
| | | | | | | | | | Change-Id: Id3fe09f39398b4deffe0023a13115494737706b9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Bump versionChristian Kandeler2024-04-081-1/+1
| | | | | | | | | | Change-Id: I180c35c178640e285bd49e7bb3533fd8dd9e3697 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * GitHub actions: adapt release jobs to JammyIvan Komissarov2024-04-081-5/+5
| | | | | | | | | | Change-Id: Ic267b0fe752bb0ea823b4bc207f2f400ff461af6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix styleIvan Komissarov2024-04-228-39/+62
| | | | | | | | | | Change-Id: I89324a1d77cdc65f916154e96ab9003f8593d7a3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Remove the fallback providerIvan Komissarov2024-04-2223-184/+27
| | | | | | | | | | Change-Id: Idbb8b86d2630cd1852fca6792e7795a8a8df490e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Cleanup licenses headersIvan Komissarov2024-04-0814-650/+49
| | | | | | | | | | | | | | | | Move the license text to a common file instead of repeating in each file. Change-Id: Icef706e1ada92b8d5a089eb6fac144dbdc0f22e9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge 2.3 into masterChristian Kandeler2024-03-2054-4/+1657
|\| | | | | | | Change-Id: I43b0575f0fadb0383b2cbcddbaad858a5885df16
| * Adapt to Xcode 15.3v2.3.0Christian Kandeler2024-03-152-3/+16
| | | | | | | | | | | | Fixes: QBS-1786 Change-Id: I25cd8c4480179cb5ecb598bbe7dd6573b1fe0832 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Tutorial. Part 2Ivan Komissarov2024-03-1452-1/+1641
| | | | | | | | | | Change-Id: I811abcf38adc1193491e736db580b709db28349f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge 2.3 into masterChristian Kandeler2024-03-075-4/+35
|\| | | | | | | Change-Id: I05108a5f884bf4f0c48a0ee93576e1b46442e03a
| * Fix PathLists in ProbesIvan Komissarov2024-03-055-4/+35
| | | | | | | | | | | | Fixes: QBS-1785 Change-Id: I59e86d9caf80ac1e8870d53d0a91cb88ad0d35b5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge 2.3 into masterChristian Kandeler2024-03-0145-328/+800
|\| | | | | | | Change-Id: Ica03e06f5d3058dd78e80278764e8cb84723ff24
| * Add CMake Exporter moduleRaphael Cotty2024-02-2914-2/+702
| | | | | | | | | | | | | | | | The module allows to generate a cmake package for Qbs libraries. Change-Id: I4405899ad73e87aeb63bd8471596e89770591b38 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * clang-tidy: fix 'cppcoreguidelines-pro-type-member-init'Ivan Komissarov2024-02-281-4/+4
| | | | | | | | | | | | | | ...on mac. Change-Id: I8979e717f7a2d97a4ce205a2eb1fcf64df3d875c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * docker: remove Focal imageIvan Komissarov2024-02-274-236/+0
| | | | | | | | | | Change-Id: I9cc2a4dd7c2baef682cead318d711e7cedb898cc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Update clang-tidy job to JammyIvan Komissarov2024-02-274-18/+6
| | | | | | | | | | Change-Id: Ice564ac6cfb6092db54f10dd0608d1299f752a84 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * GitHub actions: change extra jobs to JammyIvan Komissarov2024-02-271-3/+3
| | | | | | | | | | Change-Id: I90a95895c736a8e19e8f2945614b52ec7040f2a3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * clang-tidy: fix 'bugprone-unchecked-optional-access'Ivan Komissarov2024-02-264-5/+12
| | | | | | | | | | Change-Id: I8ec5109b70582115f6d3d19da580fddeb4475ef8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * clang-tidy: fix 'bugprone-assignment-in-if-condition'Ivan Komissarov2024-02-264-9/+15
| | | | | | | | | | Change-Id: Ia53f439a73abcdcbc7fb743739280cfa489fa66a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * clang-tidy: fix 'modernize-use-emplace'Ivan Komissarov2024-02-261-1/+1
| | | | | | | | | | Change-Id: I722b7ebe3d3c723de56a156c4752ecead1ce0b98 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * GutHub actions: fix archive suffixesIvan Komissarov2024-02-261-10/+10
| | | | | | | | | | | | | | | | | | This amends f31b3fe24d1dbd92e47b050df68d3a5b8aa286ae, 569f804a75c045785a626f2cc8806af9e5ae5978 and 60a18f09fa547af064fb851e72b816ee25bf71a3. Change-Id: Idfc923e21b7e64024032fe4b929abc53562d127e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>