aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: fix BinaryProbe examplev2.1.2-12.1Ivan Komissarov2023-09-181-2/+3
| | | | | | Change-Id: I6d9b26057f1e45458d42f18779d499953cae7e41 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Address.sanitizer: Prevent failure with Apple clang 13Christian Kandeler2023-09-151-1/+2
| | | | | | | | The -fsanitize-address-use-after-return switch was added in LLVM 13, but Apple clang 13 does not have it. Change-Id: Id0bc7c18aa2ad17faed20c2af54f192661d63b3e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Qt support: Fix selection of Qt build variantChristian Kandeler2023-09-142-0/+5
| | | | | | | | ... when qbs.buildVariant is "profiling". Fixes: QBS-1758 Change-Id: Iae6e98af3b16860a5c8e5c20ebb52fac3127e9e8 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* apple: fix dmg.absoluteSourceBase default valueIvan Komissarov2023-09-082-4/+6
| | | | | | | | | | | | | Dmg module collects all installables and replaces the absoluteSourceBase with stageDirectory. However, by default, we install the bundle to the installRoot/installPrefix/installDir folder and absoluteSourceBase missed the installPrefix path which is "/usr/local" on mac by default. Change-Id: I24dfab27b0321308347883376a052c479388418a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* apple: fix some DMG module issuesIvan Komissarov2023-09-074-64/+12
| | | | | | | | | | | | | | | | | Fix keys used in settings to match those that are actually used in python. Removed Korean and Russian license agreements - they are not listed in the allowed languages. Also, even when added to the list, Russian eula.txt makes hdutil to return with an error for some reason. Those need further investigation. Fixes: QBS-1753 Change-Id: I510d4f1896625d6a0b63c4005288d29069776c9a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: add docs for some missing Qt.core propsIvan Komissarov2023-09-071-0/+42
| | | | | Change-Id: I883be3f550706ed8178dbb247dcb481d0a9dad4c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: fix Group item docIvan Komissarov2023-09-071-10/+18
| | | | | Change-Id: I8ed20eb9bd4470941fc7b3b170bf4d9bab96a49b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Properly clean up in ScriptEngine::ImporterChristian Kandeler2023-09-012-2/+3
| | | | | | | | We must not leave "require" values behind. Fixes: QBS-1751 Change-Id: If09c452d0df07642af0cd602d146173d9b638f79 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* ModuleProviderLoader: Make sure pseudo module instances have a scopeChristian Kandeler2023-09-013-1/+4
| | | | | | | | | Otherwise the Evaluator will erroneously add the instantiating item as a scope. Fixes: QBS-1747 Change-Id: If13a9b8174000d63f020b51677b855b9027d66f1 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Update change logIvan Komissarov2023-08-301-0/+4
| | | | | Change-Id: I9b102f0efd9bb96470a37454a578f422f72202a8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: fix typoIvan Komissarov2023-08-301-1/+1
| | | | | Change-Id: I94938476436eb9164900a5104fa3c45af3ed95df Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: add xcode-less job on macOSIvan Komissarov2023-08-221-0/+20
| | | | | Change-Id: Ie535183ced8ee200c506b54d4958976f321cb7fb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* apple: Fix ApplicationExtension for the xcode-less profilesIvan Komissarov2023-08-222-2/+7
| | | | | Change-Id: I2e5c754e20286b37c8b6d79321f5eb191eefc6d0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* apple: Fix BundleModule when using xcode-less profileIvan Komissarov2023-08-222-4/+12
| | | | | | | | | | | | | Unlike Module itself, within the Rule.prepare script, we cannot access properties of the non-present Module. Fix this by adding helper properties in the Bundle module that are set to 'undefined' if xcode is not present. This amends 9cfd88b1b7cca084fabe8053d988aa0685f0cfb3. Change-Id: I5f1c86bd093610f1de8ecb9f9732b2a1b0245baf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Revert "Bump version"Christian Kandeler2023-08-221-1/+1
| | | | | | | | The commit planned to be 2.1.2 is not suitable for release. This reverts commit 0ec11ef97d82cba82495d26502167349e0acfb64. Change-Id: I1d7b240efe93b9600c2a300ea531c2d5a7301bc5 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Bump versionChristian Kandeler2023-08-211-1/+1
| | | | | Change-Id: I07bca49373987d9c8c5afc1d6d958f392560cf96 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* apple: fix tests with xcode-less profileIvan Komissarov2023-08-213-9/+37
| | | | | Change-Id: Ib606da3047c078afc0bbc44fa62cb1c111e15755 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Bump version and update changelogsChristian Kandeler2023-08-033-3/+7
| | | | | Change-Id: I9045a8f5d2a77d002b3ae4df24cc124f54aaa157 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Make checking for float64 tags work on 32-bit architecturesv2.1.2Dmitry Shachnev2023-08-022-2/+3
| | | | | | Fixes: QBS-1745 Change-Id: I11fb7fc8d9b047e814fd090141a0c434e1b6cd63 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QuickJS: Fix building on x86v2.1.1Christian Kandeler2023-08-014-1/+17
| | | | | | Fixes: QBS-1744 Change-Id: Ic2a35650ac6dc00b63d7d274d4feba46cae676cb Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Update change logChristian Kandeler2023-07-281-0/+2
| | | | | Change-Id: I720d6a7ebb8b8ba8e4a23c1892eb4c8819e3e4fa Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Update python modulesIvan Komissarov2023-07-2831-2670/+2224
| | | | | Change-Id: I7093f27644113a1c23ee6f551310e9f6b830e850 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Speedup ModulePropertyMergerIvan Komissarov2023-07-251-6/+15
| | | | | | | | | | | | | | | Add an extra Set of visited items - if item was already handled, there's no need to handle it again. Also, use unordered_set since insert into a 'flat' Set has linear complexity. With the GRPC example on mac (lots of modules in abseil libs): Before: 'Merging module property values took 10s, 768ms.' After: 'Merging module property values took 36ms.' Change-Id: I779d101be783c8dd66392c4137cfe888daa5b809 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Loader: Fix product id scope againChristian Kandeler2023-07-213-2/+16
| | | | | | | | | There's the product's scope and the scope for the product's child items, which are not related. The ids need to be in both. Amends 1410d1f12fb99fb8ab82fe3c2969bc18445a1165. Change-Id: I08b5ccc803818bd6c519ea4b5946dbbac740bdad Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Do not compare hostOS and targetOS using ===Ivan Komissarov2023-07-212-3/+3
| | | | | Change-Id: I5e5ff2a3f657461f82fe0e60547174d79ff86443 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Loader: Add proper id scope for product-level itemsChristian Kandeler2023-07-213-2/+20
| | | | | | | | As we do for modules. We can't use the file-level id scope because of multiplexing. Change-Id: Ib8a72b4ce06225ad24c78d0de4a7addb749d2469 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Add XFAIL'ing autotest for probes in multiplexed productsChristian Kandeler2023-07-213-0/+35
| | | | | | | | | In all product instances, the same Probe item from the original Product item is used, because the Probes are looked up via the per-file id scope. It seems this has never worked correctly. Change-Id: I23294cb638e60c0f7c50b20d4270caa8d0af55c4 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Bump versionChristian Kandeler2023-07-201-1/+1
| | | | | Change-Id: I04ccadc9194f937cac992060a7fc65ad2eef68a6 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Update 2.1 changelogIvan Komissarov2023-07-201-3/+16
| | | | | Change-Id: Ic91bdd0875dcf8062ed7f067ab3d692189743151 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: fix macOS jobv2.1.0Ivan Komissarov2023-07-073-1/+3
| | | | | | | | | Use qbspkgconfig in proto examples. Pass additional libs to proto/grpc tests. Change-Id: Ic3018fcb5b2350610a4ab70b97efad1abaac9252 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Check actual Probe props in providers testIvan Komissarov2023-07-043-1/+6
| | | | | Change-Id: I043dc6f956e4767e60e708bbda3b9e2c7a4417bc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix possible segmentation fault when quitting a sessionThiemo van Engelen2023-07-031-1/+8
| | | | | | | | | | | | | | | | | | | | | | | When the quit command was received via the session pipe, a segmentation fault could occur because Session (and its members) would be deleted while the main thread was still executing a lambda that contained a this pointer, pointing to the Session member m_packetReader. The call stack would be: QTimer emits timout -> lambda in WindowsStdinReader::start lambda emits dataAvailable -> lambda in SessionPacketReader::start() lambda emits packetReceived -> lambda in Session::Session() lambda calls Session::quitSession Session::quitSession calls qApp->quit() QCoreApplication emits aboutToQuit -> lambda in startSession lambda deletes session ~Session deletes m_packetReader Then the stack unwinds and in the lambda in SessionPacketReader::start, d->incomingData.isEmpty() is called and d no longer exists. Change-Id: I75b27ee945277ca780bec6535a952838eb6576d4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update dmgbuildChristian Kandeler2023-06-2911-1209/+1351
| | | | | | | | | And remove unneeded package. The dmg test is disabled for now as it is flaky. Change-Id: Ia9eefa977a5148a9b5aa2e6a39087a7c55618d49 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Export cxxLanguageVersion from protobuf modulesIvan Komissarov2023-06-288-6/+4
| | | | | | | This amends eb008eac0535ac8265cbacb449fac6806204ebe3. Change-Id: Iab410d81c9f708aa1363bc9ca969cb219fe797b5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add qdoc testIvan Komissarov2023-06-285-0/+53
| | | | | | | In order to test if qdoc is moved again. Change-Id: Ief09866860af40972e7c2a29776ac98f2ac6c5a0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* docker: update qt static imageIvan Komissarov2023-06-263-9/+12
| | | | | | | ...and install llvm into it to be able to build qdoc Change-Id: I9b468403fe690eed482c379a0c78ed5c1cd6e0a7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* BinaryFile: Ensure unsigned valuesChristian Kandeler2023-06-213-5/+14
| | | | | | | | | C's Usual Arithmetic Conversions were playing tricks on us, and unexpectedly large values ended up in the array. Fixes: QBS-1740 Change-Id: If246e08c1a322fe3e85f3447fc7bc14989671d3e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* quickjs: Add stack overflow checkChristian Kandeler2023-06-201-0/+4
| | | | | | | As published here: https://github.com/bellard/quickjs/pull/182 Change-Id: Icec59a726df1b9015860e23d1f8e603927dd2908 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* GitHub actions: fix Xcode profilesIvan Komissarov2023-06-191-4/+4
| | | | | | | This amends 134d6b6666c1d121b6134a02c4766576705700aa. Change-Id: I037a538c85c7c03f4e7449d5628ad839356501ed Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Bump c++ ver for protobufIvan Komissarov2023-06-195-5/+5
| | | | | | | ... to c++17, otherwise tests fail on mac Change-Id: Iaf2f14d67c65b3beb679225f77aeb6f20039e39b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Cocoa Touch Application: add example of code signing settingsAndrey Filipenkov2023-06-181-0/+5
| | | | | Change-Id: I625adee1d6fc9bc720c76b72d624a36f879ded39 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Allow exporting/importing settings to/from JSONIvan Komissarov2023-06-167-22/+195
| | | | | | | | The format is determined by the file extension. Fixes: QBS-1685 Change-Id: I1544fc7c440a4be0d2d0b8013bd7d5994c6d1288 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GutHub actions: remove redundant jobIvan Komissarov2023-06-161-10/+0
| | | | | Change-Id: Id74fceeca982e2ec5ad5f4f7a7517f26705c2e5c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Java: Allow to blacklist JDK paths in the testsChristian Kandeler2023-06-092-2/+10
| | | | | | | | E.g. the java_home tool on macOS may point us to an unsuitable JDK, which breaks the test. Change-Id: Ifaf14135889d2dc6582d377bfa52597f43be88c6 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Merge 2.0 into 2.1Christian Kandeler2023-06-093-23/+33
|\ | | | | | | Change-Id: I3a2da652e00ff2adb5e899ce99ad7ed1b8ca37b2
| * GitHub actions: Bump Xcode version to 14.3v2.0.22.0Ivan Komissarov2023-06-071-21/+30
| | | | | | | | | | | | | | And remove old 12.5 job. Change-Id: I96a990e9417603d19dc841546e858f9b68665f25 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * apple: fix selecting SDK for tvOSIvan Komissarov2023-06-072-2/+3
| | | | | | | | | | | | | | | | Since Xcode 14.3, there's an additional AssetRuntime.tvOS16.4.sdk which is wrongly selected by default. Change-Id: I13759ca8ebd1f4b1a699d1fd2d70fb3d6f5c1a2a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Java: Work around some macOS peculiaritiesChristian Kandeler2023-06-042-5/+33
| | | | | | | | | | | | | | | | | | Namely, the java_home tool on my test machine - ignores the --version switch unless --failfast is given - fails for any architecture filter Change-Id: Ibac3189da3f795860b79290bdc8c863ef6861e61 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Add changelog for 2.1.0Christian Kandeler2023-06-021-0/+15
| | | | | | | | | | Change-Id: I8247a5b4f6f6fcfa00a4fc6512b6d741207e3268 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Loader: Merge the remains of ProjectTreeBuilder into ProjectResolverChristian Kandeler2023-05-319-456/+195
| | | | | | | | | | | | | | | | This will enable us to get rid of redundant data structures and the two- phase product handling. Change-Id: I8a9f5e06b216f7b8cd8842acfbcf77edc30fadb4 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 14:42:57 +0000