summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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 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>
* | Qt support: Fix static builds against Qt 6Christian Kandeler2022-03-252-4/+14
| | | | | | | | | | | | | | | | | | Qt 6 prl files can contain object files these days, which we must de- duplicate manually when gathering plugin libraries. Task-number: QBS-1692 Change-Id: I479cf759b53bde0908f150de86405a810f5b2dea Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* | Fix/suppress compiler warnings with Qt6/MSVCOrgad Shaneh2022-03-253-3/+4
| | | | | | | | | | Change-Id: Ic3a13c71a841a3e6c31a2c6d06c79836a54318fb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix compile before Qt5.15Christian Stenger2022-03-151-1/+1
| | | | | | | | | | Change-Id: I6c8d265adf8e8b15c0a615a0f52ecc889ff862d3 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Add changelog for 1.22.0v1.22.0Christian Kandeler2022-03-011-0/+31
| | | | | | | | | | | | | | Change-Id: I757fd3f325b8e679da1d473322e26f1ac1d9752c Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add test to check the SDCC compiler probeDenis Shienkov2022-02-282-0/+30
| | | | | | | | | | Change-Id: Iaeb8ff81f37e152667aace86156de2c96397d9e3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add test to check the Digital Mars compiler probeDenis Shienkov2022-02-283-0/+34
| | | | | | | | | | Change-Id: If43314a34cbae3b66d6221cb21e6ba32e4aaae38 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Skip `shared-libraries` test for GCC toolchainsDenis Shienkov2022-02-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | ... because we can't detect the target 'none' platform in case of a bare-metal GCC (this feature is not implemented yet). In other words, the barametal platforms do not support the shared libraries. Change-Id: I8ea62e649474e57ecc363b556e5f901a35c3fa85 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectResolver: Fix disabled dependencies with Qt6Björn Schäpers2022-02-281-1/+4
| | | | | | | | | | | | | | | | | | Since the QHash references aren't stable anymore we had some fun here. Either qbs crashed or we hit the assertion in projectbuilddata.cpp:399 QBS_CHECK(dependency->enabled); Change-Id: I9be34e5a315c4c0834c40782972fb358ead31457 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix Windows CIIvan Komissarov2022-02-241-3/+3
| | | | | | | | | | Change-Id: I982d647067155820ae51b707aa4b303ee64fe4ff Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add test to check toolchain probesDenis Shienkov2022-02-215-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now we don't have tests that could check the correctness of the properties returned by toolchain probes. For example, such as `architecture`, `targetPlatform`, `endianness` and so forth. The number of returned parameters depends on the type of toolchain. This patch adds a test for the probe for the `watcom` toolchain and can be used as a template for adding the tests for other probes in the future. Change-Id: I5ebda0deb7538f746406f5b0925bdd60fdb4c3fb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add simple test for linking with shared librariesDenis Shienkov2022-02-218-33/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we use the baremetal tests for non-baremetal compilers (for example, for `watcom` and `dmc`), then we need a test for linking the application and the shared library. We cannot use the existing tests for `watcom` and `dmc` toolchains, because these toolchains have specific behavior and also do not fully support the STL. Therefore, the simplest dependency linking test is used here. Also fixed the shared library creation for these toolchains. Change-Id: I0e5d5ede39fa0c9b4bf7db54adc3f161e0aea91c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix compilation on Qt6Denis Shienkov2022-02-181-1/+1
| | | | | | | | | | Change-Id: I23182467f28a20e981563ec9f77173ea87e4c693 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Refactor SDCC compiler detectionDenis Shienkov2022-02-171-63/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug with the missing profiles.push_back() call in the createSdccProfileHelper() function. Also this patch simplifies a code: * Used the common public dumpMacros() function to dump the pre-defined compiler macros. * It is enough to read only the `__SDCC` macro to parse the compiler version, because this macro exists on all compiler versions (unlike the `__SDCC_VERSION_xxx` macro which is available only on the versions more than 3.x). * Removed extra line breaks to make the code as compact as possible. Change-Id: Icda1bc0189ef4e374db4b82a29af490b1d2931db Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add support for other platforms supported by Digital MarsDenis Shienkov2022-02-178-129/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the following target platforms: * DOS - both 32/16 bit. * Windows - 16 bit. Also, more specifically, the target is controlled by the `cpp.extenderName` property, which is the DOS extender to use. The Digital Mars support the following DOS extenders: * Rational 16 bit DOS Extender * ZPM 16 bit DOS Extender * DOSX 32 bit DOS Extender * Pharlap 32 bit DOS Extender which have the following names `dosr`, `dosz`, `dosx`, `dosp`. The user can set any of the desired values in the `cpp.extenderName` property (also this property can be empty that means no any extender is used). Right now the `qbs-setup-toolchain` utility creates all possible supported profiles with the required pre-configured properties: Profile 'dmc-8_57_0-windows-x86' created for 'C:/dm/bin/dmc.exe'. Profile 'dmc-8_57_0-windows-x86_16' created for 'C:/dm/bin/dmc.exe'. Profile 'dmc-8_57_0-dosx-x86' created for 'C:/dm/bin/dmc.exe'. Profile 'dmc-8_57_0-dosp-x86' created for 'C:/dm/bin/dmc.exe'. Profile 'dmc-8_57_0-dosr-x86_16' created for 'C:/dm/bin/dmc.exe'. Profile 'dmc-8_57_0-dosz-x86_16' created for 'C:/dm/bin/dmc.exe'. Profile 'dmc-8_57_0-dos-x86_16' created for 'C:/dm/bin/dmc.exe'. Compiling with DOS extenders requires additional external utilities and libraries (depending on the extender type). Some of them are no longer available at the moment, so the tests in CI are only done for the `dmc-windows-x86`, `dmc-windows-x86_16`, and `dmc-dos-x86_16` profiles. Change-Id: I221d2995900c63605c8552b825bf0c4d55171f5c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Update documentation about WatcomProbeDenis Shienkov2022-02-151-2/+2
| | | | | | | | | | Change-Id: Ic06f4d2ff28425a7fb76c38ca69144a0db1a3ab2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add launch of test application target if possibleDenis Shienkov2022-02-154-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is to check that the compiled application works correctly by running it and reading its output. This will only work if the host platform and target platform are the same, otherwise the launch is simply skipped. Since we use baremetal tests also to test other platforms (for example, using the OpenWatcom or DigitalMars toolchains), the base application `BareMetalApplication.qbs` is created as a console application. The reason is that for baremetal it is always a console, but for non-baremetal it can also be a GUI which requires a different main function. Change-Id: I520ba411582223950521b4b06c2e01bce49fe089 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Darwin: Set MinimumOSVersion property for mobile Apple platformsChristian Kandeler2022-02-151-0/+7
| | | | | | | | | | | | Fixes: QBS-1690 Change-Id: I34b4d3f96ec2790d47e33a018892c67fea5f838d Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Fix detection of architectures and target platforms for Open WatcomDenis Shienkov2022-02-151-2/+9
| | | | | | | | | | | | | | | | ... inside of a probe by using the functions from the ModUtils library. Change-Id: If84bc393e9e85ba50bed105dd645aaef2cff004f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Android: Allow to generate multi-arch package with Qt >= 6.3Raphael Cotty2022-02-092-1/+24
| | | | | | | | | | | | | | | | | | | | In Qt 6.0, android installation was split in different directories and the androiddeployqt could not work with multiple install dir. This is fixed in Qt 6.3.0 and requires this change to call androiddeployqt. Change-Id: Ia402950fb835e956045ec28a9896c0b5cafbd9e8 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Disable Windows Baremetal testsIvan Komissarov2022-02-091-1/+2
| | | | | | | | | | | | | | We no longer have access to the VM and it was shutted down. Change-Id: I5ec6f09e10b87c9a4898ee5494dc42a9d9962371 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add support for other platforms supported by Open WatcomDenis Shienkov2022-02-097-172/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the following target platforms: * DOS - both 32/16 bit. * OS/2 - both 32/16 bit. * Windows - 16 bit. Also all these platforms covered in CI tests. Change-Id: Ie75d9203c50f4d61546b19328992ff0e107d9942 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Configure CI for Digital Mars compilerDenis Shienkov2022-02-084-1/+140
| | | | | | | | | | | | | | ... and also as fix the typo in the DmcProbe.qbs file. Change-Id: I2f62b862b900c92be97c6eb6a9b461ac5973b8ea Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add probe items in module providersRaphael Cotty2022-02-0811-5/+64
| | | | | | | | | | | | | | | | Probes can now be used in the ModuleProvider item. Change-Id: If1bf07269aa7d9c3c9dd8a41ac4bd3d259393a49 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Add Qt 6.3 Android image and update ANDROID_PLATFORMRaphael Cotty2022-02-064-26/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | Add docker image focal-android-630 and corresponding github action. Update ANDROID_PLATFORM to "android-30" because Qt AndroidManifest uses property allowNativeHeapPointerTagging (QTBUG-97009) since 6.2.1 which was added in API30. Also update android test because bug QTBUG-97834 was solved in Qt 6.3. Change-Id: Id45701433a779d2c6cb8dfdbfb0676e2daad6f88 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Do not use std::string in HostOsInfoIvan Komissarov2022-02-049-62/+58
| | | | | | | | | | | | | | | | We are not going away from Qt and converting QString to std::strgin and vice versa does not make any sense. Change-Id: I99c0067a4738566728c503fe39f0d0a945d4e977 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Long live Open Watcom toolchainDenis Shienkov2022-02-0419-6/+1470
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds basic support for the Open Watcom toolchain. This patch uses the `owcc` compiler (supplied with the toolchain), which is a wrapper that supports the POSIX standard. Reason is that the native OW compiler and linker has a limitations in the command line arguments (e.g. they have wrong quotes handling and so on). This patch supports both the latest official version v1.9 and also its fork v2.0. Also added the CI autotests for the version v2.0 for the Windows host. These autotests only perform a limited number of tests (only the bare-metal tests) due to the following toolchain limitations: * The toolchain does not have STL support (there seems to be some kind of the partial support in the form of separate legacy STL ports). * The toolchain support something compatible with the C++98 standard. * The toolchain does not support the shared libraries on Linux hosts. These limitations make it impossible or unjustified to reuse most of the available tests (it requires a lot of work). There was also an attempt to set up CI for tests on Linux host, but for some reason the toolchain installer crashes on CI (although it works fine on a local PC with Ubuntu). Change-Id: Iecf76f51f0b09d31a89683f786b9cd7a825f235e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Add qmlImportPaths property to Qt.android_supportJan Blackquill2022-02-033-2/+15
| | | | | | | | | | | | Change-Id: I3fd73b5053562b139324d3a473184e9c520c2587 Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Fix typoIvan Komissarov2022-02-031-1/+1
| | | | | | | | | | | | | | | | Amends 54ec5e8851f0573beb466ddec2e20a1f3c2b7f7a. Change-Id: Ie527099f16092715b3d11d65e5d6bdbf575bbc64 Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add support for new MSVC2022 toolset version in VisualStudioVersionInfoDenis Shienkov2022-02-021-2/+3
| | | | | | | | | | | | | | ... that uses by the Visual Studio project generator. Change-Id: I653604c77b2ab3b431dedb4cc2d031d4ddea5aed Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix auto-detection for MSVC2022Denis Shienkov2022-02-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... otherwise the profile names will be incorrect: Setting up profile 'MSVC0-x64'. Setting up profile 'MSVC0-x64_x86'. Setting up profile 'MSVC0-x86_x64'. Setting up profile 'MSVC0-x86'. they should start with `MSVC2022` instead. Change-Id: Ibf45677d89c716d6c149a94faee65220101fa83e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Allow to configure job limitsDenis Shienkov2022-02-015-0/+21
| | | | | | | | | | Change-Id: Ie79f92852ab4895f472d247cfd3dd51c6fb1228f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
View Lorry Controller Status