summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Update static docker image to Qt 6.3.1Christian Kandeler2022-08-022-3/+3
| | | | | Change-Id: I6ebb9976cd003e9d1a6bbf0a16730088c4c4fb8c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Fix changelogs/changes-1.23.1.mdIvan Komissarov2022-08-011-2/+4
| | | | | | | | | | Cpp module should have its own section. This amends 825d344f0676fbc3ffe17f30b30768f303ee62e2 and 123256af285883c2c2b21bae5575e18fb8f71beb. Change-Id: I12ff8a7d7a06093856b3c7ddc60ab60f8bb63a65 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* MSVC: Support cLanguageVersionOrgad Shaneh2022-08-014-8/+42
| | | | | | | | | | It is supported since MSVC 16.8[1] and clang-cl 13[2]. [1] https://devblogs.microsoft.com/cppblog/c11-and-c17-standard-support-arriving-in-msvc/ [2] https://github.com/llvm/llvm-project/commit/d087d805acb664e885e9c31a916f6cfa5dbc2186 Change-Id: I858beadf20c357d8a4c369ab7bc32f69ef956ebb Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Support c17 and c2x values for cLanguageVersionOrgad Shaneh2022-08-015-10/+28
| | | | | | | | | | Compiler version sources: https://en.wikipedia.org/wiki/C17_(C_standard_revision) https://en.wikipedia.org/wiki/C2x https://en.wikipedia.org/wiki/Xcode#Xcode_11.0_-_14.x_(since_SwiftUI_framework) Change-Id: I3bdb54334e0cbf326a5d25d31c45f331cbb36c55 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qbspkgconfig: Fix incorrect iterator usagesIvan Komissarov2022-08-011-5/+14
| | | | | | | | We ended up dereferencing then end() iterator in many cases. Not that is a problem, but MSVC strict iterators crash in debug. Change-Id: Ie7cf1fd4a37cc37d568943a5bab57ac699f19265 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add changelog for 1.23.1Christian Kandeler2022-07-301-0/+9
| | | | | Change-Id: I9ff9aac9d332b28af6af2cb9a5d74aaf69de34c2 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Qt support: Adapt to change in location of the qscxmlc toolChristian Kandeler2022-07-291-2/+3
| | | | | | | It's in the libexec dir as of Qt 6.3. Change-Id: Id6e86b41ee956732d81aa18d3b44ccb436c38c0b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Bump versionChristian Kandeler2022-07-291-1/+1
| | | | | Change-Id: Ic4cf09546be09d6bc5f825cbf0720cd1854b428b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* GitHub actions: Update macOS jobsIvan Komissarov2022-07-281-20/+20
| | | | | | | | | | Also, remove XCode 10.3 because macos-10.15 runner is deprecated. Cherry-picked f169b258e95e329d81c42ddfd65b084fd97e47ef. Change-Id: I680c996ae1de63ad9d75cdb15c185f7ac3d5e275 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix install-qt.shIvan Komissarov2022-07-271-2/+2
| | | | | | | | | The condition should not affect ios This amends 59e983d5d998d62930e590264ff70314b84f3a90. Change-Id: I6c1912d43d455188476976712be0a6b4989e128a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix linux baremetal testsIvan Komissarov2022-07-273-5/+0
| | | | | | | This partially reverts 363e32d41c297355c9766c34ac6b61bfbc668b6a. Change-Id: I2fb58b0505e76b9bc46da6af8ba195e8c821a723 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix protobuf on macos 11Ivan Komissarov2022-07-251-0/+1
| | | | | | | | | | Otherwise, proto files are not linked with the missing reference to ~InternalMetadata(). Similar issue is here https://github.com/google/oss-fuzz/issues/7736. Change-Id: I4ad04fbcb2c49f2ab435ca560de623fae97754b4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix clang-tidy errorsIvan Komissarov2022-07-252-5/+6
| | | | | Change-Id: Iec06eaf35b4ee23edb9f744b80b57db5115f3b4c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Fix documentation of PkgConfigProbe propertiesv1.23.0Thorbjørn Lindeijer2022-07-191-2/+2
| | | | | | | The exactVersion and maxVersion docs were somewhat mixed up. Change-Id: I840fb09e72ab53251edd1c2af038f080eb27905a Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Qt support: Fix static buildsChristian Kandeler2022-07-074-5/+17
| | | | | | | | - prl files can refer to QT_INSTALL_PLUGINS - object files can appear in QMAKE_PRL_LIBS Change-Id: I2ab707ab3677a1e7be71c93f211677b5df04b23f Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* qbs build: Fix use of warning flagChristian Kandeler2022-07-041-1/+3
| | | | | | | -Wconstant-logical-operand is clang-only. Change-Id: I8dbba65b503b865ac331ce555b941f9dc1929e3a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Add changelog for 1.23.0Christian Kandeler2022-06-241-0/+16
| | | | | Change-Id: Id9bc1397e6befee56ee26cef8085bda53d7cdc0c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix Android build-tools detection, if it was installed via cmdline-toolsMax Bespalov2022-06-231-13/+9
| | | | | | | | | | | | | | | The modern way to install android packages is to use cmdline-tools. The old way was to use SDK tools, but now it is deprecated (see https://developer.android.com/studio/releases/sdk-tools). There is a code in AndroidSdkProbe which looks for android executable in SDK tools folder to prove, that the folder does contain Android SDK. But if you use cmdline-tools, there is no folder "tools" anymore. The probe fails to find build tools. The fix is to look for build-tools directory. Fixes: QBS-1700 Change-Id: Iad92664ba07d034ba365e8b7b178cd47f5d3f187 Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix compilation of .jar files declared in the productMax Bespalov2022-06-231-0/+7
| | | | | | | | | The java.jar artifacts declared in the product were ignored during dex compilation. The function were looking only for jars in the dependencies. Fixes: QBS-1701 Change-Id: I4d7b355236fc988f44161aaa22d87a16a7e94fb6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt support: Add /permissive- flag with MSVCChristian Kandeler2022-06-032-1/+11
| | | | | | | | | This is required for user applications as of qtbase/0dc6cc055174a0556f2e41ca269013b3a7056c86. Also update our own build system files accordingly. Change-Id: Ibc640555cdf0cae6e0c5353b2f5d99af4475b510 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge 1.22 into masterChristian Kandeler2022-05-204-8/+8
|\ | | | | | | Change-Id: I8438df69b247b30b98a7045adc04e4d43105fa38
| * Fix clang-tidy job1.22Ivan Komissarov2022-05-202-5/+5
| | | | | | | | | | Change-Id: Ifdaed0906a4619a8f681fd900f0939cf26b0f059 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * ScriptEngine: Suppress another warning on MSVCOrgad Shaneh2022-05-171-2/+2
| | | | | | | | | | | | | | JavaScriptCore\runtime\RegExp.cpp(214): warning C4018: '>': signed/unsigned mismatch Change-Id: Ie4b4f8d31065c293b9d752a6c14747bab3556309 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * cmake: Fix syntax of regexDmitry Shachnev2022-05-091-1/+1
| | | | | | | | | | | | | | | | Because of this bug, 1.22.0 was correctly replaced with 1.22, but 1.22.1 was wrongly left as is. Change-Id: Iadadb543fa57c4f897bbff3109cfc3216e92b8ae Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge 1.22 into masterChristian Kandeler2022-04-202-1/+3
|\ \ | |/ | | | | Change-Id: I36fc5c61dafe4f5fc87db53d863cc97743440deb
| * Fix install of QCH and HTML documentationv1.22.1Dmitry Shachnev2022-04-202-1/+3
| | | | | | | | | | | | | | | | | | - qbs.qch should go to QT_INSTALL_DOCS, not to QBS_DOC_INSTALL_DIR (which ends with /html by default). - HTML documentation was not installed at all. Change-Id: I11fa33e5d2f9e0a39184a7d82ac1a8faf064f25e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge "Merge 1.22 into master"The Qt Project2022-04-147-10/+22
|\ \
| * \ Merge 1.22 into masterChristian Kandeler2022-04-087-10/+22
| |\ \ | | |/ | | | | | | Change-Id: I9d36b1bacae3c0f449c67d985fea626e798e4f8b
| | * Update changelogChristian Kandeler2022-04-081-2/+11
| | | | | | | | | | | | | | | Change-Id: Ic571216e459246f98789b21de40e7d25f132fba0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Merge "Merge remote-tracking branch 'origin/1.21' into 1.22" into 1.22The Qt Project2022-04-083-3/+5
| | |\
| | | * Merge remote-tracking branch 'origin/1.21' into 1.22Christian Kandeler2022-04-073-3/+5
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems we completely forgot to merge 1.21 into master, losing at least some of the bugfixes in 1.21.1. Change-Id: I4e8e32a861da817d9b686991933d6a32332534c5
| | | | * Bump version to 1.21.11.21Ivan Komissarov2022-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie696856c3ffc13636cb09e4deec2a35c68aec041 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | | | * Doc: align JSON API ErrorInfo with codeRobin Farine2022-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ErrorItem::toJson()' maps the key 'description' to the textual description of the error. Change-Id: I92c4b7521f6ffbda60196eb1fa363a0a79431f6a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | | | * Qt support: Fix QtQuick compiler path for Qt 6Christian Kandeler2022-01-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends 1e518097fa. Change-Id: Id9c22085ec0f2e3f771e8df453fc9dbb79720d5c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | | | * Remove bogus reset of build graph's "dirty" flagChristian Kandeler2022-01-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's unclear why that code was ever there. Fixes: QBS-1686 Change-Id: I893216c9b27afeec8913f59e55f475d58964eb92 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * | | Documentation: Adapt to introduction of "exportingProduct"Christian Kandeler2022-04-072-4/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends 7f424ec158. Fixes: QBS-1694 Change-Id: I0cc6d1a022c863ce38e0dd0e3f00ba7929c73041 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * | Fix build for android when the project has file named "version"Dmitrii Kolpakov2022-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assembly for android breaks when there is a "version" file in the root folder of the project. Fixes: QBS-1691 Change-Id: Ie86d23618dff5fa0e28cbf3b756133df5751160f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | | | Add module for providing AddressSanitizer supportChristian Kandeler2022-04-115-7/+165
|/ / / | | | | | | | | | | | | Change-Id: Id34e57a59ad21961ee32da1bf93f6a55596d95aa Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | | Merge 1.22 into masterChristian Kandeler2022-04-0415-54/+92
|\ \ \ | |/ / | | | | | | Change-Id: I2181ed85563337acab8ec4b563b45511be16f21f
| * | Add changelog for 1.22.1Christian Kandeler2022-04-041-0/+7
| | | | | | | | | | | | | | | Change-Id: Ided671e2255315dba2bdbc0491eed3689cd36d53 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * | Fix Xcode support for 13.3Christian Kandeler2022-04-044-39/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some .xcspec files got new names and/or locations. Also, we now fully expand the values of property list variables before applying formatters. Presumably this used to work by accident because a simple look-up never produced a value in need of expansion. Fixes: QBS-1693 Change-Id: Ie66ec69042cdceede9d5ddec7c17de1c3c25a167 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * | Bump versionChristian Kandeler2022-03-311-1/+1
| | | | | | | | | | | | | | | Change-Id: Iecc83aa9f30486068f01db16e35aaff890faa225 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * | Qt support: Fix wrong lib file path deduction for "external" modulesChristian Kandeler2022-03-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The list of libraries can contain names (e.g. "m" or "z") rather than file paths, in which case we must not use it to guess the module's library file. Amends c82daaac43. Change-Id: I10fd6e1fcc8268adbc595345af80955be0dba5ec Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * | Fix building release packagesIvan Komissarov2022-03-291-1/+1
| | | | | | | | | | | | | | | Change-Id: Ic3957b7dbaf449bb52af117d8a84fc3752a9309f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * | Qt support: Consider QT_INSTALL_PREFIX when reading .prl filesChristian Kandeler2022-03-254-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | ... for gathering plugin dependencies with static builds. Task-number: QBS-1692 Change-Id: I57322da56c5145cec0250f204b4b06a3a9140bf6 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
View Lorry Controller Status