aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '1.18'Ivan Komissarov2021-02-1929-20/+504
|\ | | | | | | Change-Id: I4e437865514add88558f66420718bc02fb39e41d
| * GitHub actions: use empty qbs.installPrefix for release packagesv1.18.1Ivan Komissarov2021-02-171-1/+3
| | | | | | | | | | | | Change-Id: Ifddbebe4b3126d9f705df860622abd44bf5e5b7b Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * do not depend on QtGui in release buildsIvan Komissarov2021-02-151-1/+3
| | | | | | | | | | Change-Id: I3be7b45e105fe2f605b4ffaf7ed059c62d790edb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * qt6: fix handling qtmain in setup-qt.jsIvan Komissarov2021-02-121-0/+2
| | | | | | | | | | Change-Id: I00fa1d5e3a2fdb24a84afe713c3ea2c4543f84bd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Fix static build with qmakeRichard Weickelt2021-02-091-4/+2
| | | | | | | | | | | | | | | | | | | | Building Qbs statically did not work since Qbs 1.17 because the application target did not correctly track the plugins as a dependency. The condition in qbs.pro was simply wrong. Fixes: QBS-1594 Change-Id: Id906423bd0d8d85b7a4f3342df4b9d39f60c4e36 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Qt/Android: Extend rule cycle prevention hackChristian Kandeler2021-01-264-6/+77
| | | | | | | | | | | | | | | | | | | | | | After we did remove the hpp tag from the java-generated header, it was re-added by a file tagger in the cpp modules file, leading to an unexpected state on rebuilding. Fix this by replacing the tag, rather than removing it. Fixes: QBS-1628 Change-Id: I9d182cd30cf9a637733b84234e7a0b37f7583334 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * cmake build: Turn project file updates on by defaultEike Ziller2021-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | Project file updates should be supported by any qbs binary, since nowadays IDE integration is not tied to a special build of Qbs. Task-number: QTCREATORBUG-25232 Change-Id: Ic2fe6b0ecdb77d84209ce16fdfe8158334a8bb29 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * Xcode: Fix XCode auto-detectionIvan Komissarov2021-01-042-1/+55
| | | | | | | | | | | | | | | | If Xcode is moved to another location, we should use xcode-select -- print-path to find it rather than using hardcoded path. Change-Id: I9b5eba19c9e732e5e9da0322320fb0406249e020 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Bump version to 1.18.1Richard Weickelt2020-12-231-1/+1
| | | | | | | | | | Change-Id: I151d9c3f1e42e42d72c031b523e3ab4c11c10ab1 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * Add more paths to search in Library and Include probesJan Blackquill2020-12-232-1/+3
| | | | | | | | | | | | | | | | | | These paths are used by containerisation systems such as Flatpak; searching in these by default makes building Qbs applications in Flatpak et. al easier Change-Id: I438ba1ffd66845ac1331791428135eb70105ff34 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * Add protobuf.nanopb documentationKai Dohmen2020-12-182-0/+160
| | | | | | | | | | | | Change-Id: Id0e2744fc9dcf8b30bf15eb543036947399664e3 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Add qt4 docker image for basic testingRaphaël Cotty2020-12-1815-5/+198
| | | | | | | | | | Change-Id: Ied6d9eac49fcb20de72499ab7c39e83a90a98b75 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Implement codesign moduleJake Petroules2021-02-1820-353/+1233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves code signing functionality into a dedicated module, and also implements automatic provisioning for Apple platforms, which automatically selects appropriate signing identities and provisioning profiles based on the product being built. This also results in a significant performance improvement since all code signing setup information is retrieved in process instead of forking off the openssl and security command line tools. Task-number: QBS-899 Change-Id: I60d0aeaeb2d1004929505bcb1e0bc77512fe77bc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | qt6: do not use QString::fromUtf16(ushort*) overloadIvan Komissarov2021-02-161-1/+1
| | | | | | | | | | | | | | ... it was deprecated Change-Id: Ibfff7424383edada54407e795fdf0b1757839dcb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | GitHub actions: bump default Qt version to 5.15.2Ivan Komissarov2021-02-161-1/+1
| | | | | | | | | | Change-Id: I686344d18d609c1a9230c0eb2de9b9ff8f1f8ca0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | docker: update focal image to Qt 5.15.2 and Qbs 1.17.1Ivan Komissarov2021-02-161-3/+3
| | | | | | | | | | | | Change-Id: I363d99d15c5fe9cfc1320a579b48710f2a71a40f Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | qt6: fix -Wformat warningsIvan Komissarov2021-02-161-2/+2
| | | | | | | | | | Change-Id: Ia4107e6afdd94df06b4957317881768f4259c9d2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Fix detection for Keil toolchainsDenis Shienkov2021-02-161-82/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous implementation does not work if qbs is compiled with 64-bit compiler. The reason is the wrong path in the registry, because it differs for 32/64 bit applications. Besides, the search in the registry was difficult, it was done through the `Uninstall` section, with the parsing of the `tools.ini` file. But we can use an alternative search algorithm using the `HKLM/SOFTWARE` path instead, that simplifies the algorithm. This patch tested with the Qbs compiled with both 32/64 bit compilers. Change-Id: I87e9f62966482ba840b0aa92d4600be29b296384 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Test for array-like objects with instanceof ArrayRichard Weickelt2021-02-1514-17/+17
| | | | | | | | | | | | | | | | | | | | Array.isArray() seemed to work for arrays created in scripts as well as for QStringList and QVariantList created in C++ when using QtScript. QJSEngine is more strict (see the comments in QTBUG-45018). One way to work around that problem is to use instanceof Array instead. Change-Id: I0f1c8757a5ab2f82e26eff19a8b5ecf667bb04b1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | GitHub actions: Enable dumping cores on MacIvan Komissarov2021-02-151-1/+10
| | | | | | | | | | Change-Id: Ib83996b69d03d081830d63e25fca819bd4c47c29 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | qt6: fix install-qt.sh to support the qt5compat moduleIvan Komissarov2021-02-151-0/+1
| | | | | | | | | | Change-Id: I2d2ba4ce54b4099b44c2f3124128ec87ac422e93 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix installation directory for the QtCreator componentIvan Komissarov2021-02-151-9/+16
| | | | | | | | | | | | | | | | | | | | We have several places (e.g. in docker files) that assume that QtCreator is installed into /opt/Qt/Tools/QtCreator This amends 7f1ee5c871699f89e7fdd741fcd1f0b2167a203b Change-Id: Ifb122c105b95acd18c6e938009fd87529791d16d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Get rid of product.moduleProperty() during project resolvingRichard Weickelt2021-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | Although not documented, it was possible to access module properties via product.moduleProperty("module", "property"). That is still possible in the QJS port of Qbs, but would complicate the implementation of Evaluator unnecessarily. After all it was only needed in a single place. It can still be used in rules. Change-Id: I40f374a57a6fefc85eb45250b472fe732b66f0b7 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Place isNotSystemRunPath in the correct scopeRichard Weickelt2021-02-141-4/+5
| | | | | | | | | | | | | | | | The function isNotSystemRunPath() was used outside of its definition scope. Although that was valid JavaScript, it was still confusing. Change-Id: I25269ce8356637d00ddc281696ae6828f9345488 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Do not rely on leaked context variablesRichard Weickelt2021-02-132-5/+5
| | | | | | | | | | | | | | | | | | | | | | The current QtScript implementation seems to leak variables of the prepare script context to invoked JS functions. This will become an error in the JS port. Amends d3fa7fe. Change-Id: I5618efe7e1e8a19656f6a2e6a086267405dd69ec Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Avoid writing to the global objectRichard Weickelt2021-02-132-3/+3
| | | | | | | | | | | | | | | | Some variables were accidently created in the global object. This will become an error in the QJS port. Change-Id: Ifa4d929bb7a97af3e49de5c3d7d87924f9c3ad81 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Do not rely on leaked context variablesRichard Weickelt2021-02-132-2/+2
| | | | | | | | | | | | | | | | | | The current QtScript implementation seems to leak variables of the prepare script context to invoked JS functions. This will become an error in the JS port. Change-Id: If4b43e6162b4c3ea1f1ec8f118474064dc9586c0 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Add missing import statementsRichard Weickelt2021-02-134-1/+5
| | | | | | | | | | | | | | | | | | The current QtScript implementation does not warn about missing import statements in some cases. Imported .js files should never inherit imports. This will become an error in the JS port. Change-Id: I880afabba64c0766063304c723242e242ac89b81 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Allow to overwrite path to Perl in scriptengine.qbsIvan Komissarov2021-02-121-1/+7
| | | | | | | | | | | | | | Can be useful if perl is not in PATH e.g. on Windows Change-Id: Id3d245588fea5dd3ca2579f418f2e6fe43151994 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add RISC-V 64-bit architecture for GCC compiler to CIDenis Shienkov2021-02-123-2/+5
| | | | | | | | | | Change-Id: Iff317ec5e4a06e9fc9ae4e0a20c6e55656af2855 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Pass tests for RISC-V architecture for GCC toolchainDenis Shienkov2021-02-111-0/+5
| | | | | | | | | | Change-Id: If2d249031a5fc1f1fdcdb0414d9cf43607505bf4 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | qt6: Do not use QVariant::Type as it was deprecatedIvan Komissarov2021-02-118-40/+40
| | | | | | | | | | Change-Id: I0dad1ee403176a665e4e9dead2f94dd032e1d75b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | qt6: Do not use QVariant::type()Ivan Komissarov2021-02-1114-35/+35
| | | | | | | | | | | | | | | | | | ...and use QVariant::userType() instead since type() method was deprecated (variant.metaType().id() or variant.typeId() or variant.userType() should be user instead). Change-Id: I00b93c5e010a0c7b733b3c6dfeae2d744be32ce1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | buildgraph: fix storing container sizesIvan Komissarov2021-02-103-3/+3
| | | | | | | | | | | | | | | | The type should match the one used in load() since in qt6 the type is not int anymore Change-Id: I0e7e402dec6f059279de933d5afd0c450cde8ddd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add new 'compiler-defines-by-language' testDenis Shienkov2021-02-106-0/+82
| | | | | | | | | | | | | | | | | | This test is an adaptation of a similar existing test. A main difference it that this test intended only for a `bare-metal` toolchains where there may be no support for a C ++ compiler. Change-Id: I4ea023743a4940c96dd9abc96ffda8cd06385b0b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | qt6: explicitly register Transformer * and JavaScriptCommand * metatypesIvan Komissarov2021-02-101-0/+3
| | | | | | | | | | | | | | Otherwise, Qt complains when emitting the signal Change-Id: I1840eff8c041ca21475658cb3113e81298b3a8a6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | qt6: fix Qt library version in bundledqt.qbsIvan Komissarov2021-02-101-1/+3
| | | | | | | | | | | | | | Qt6 uses "A" version instead of "6" Change-Id: I1e424f0f62659b481545511c9ba5eec3b2f92892 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Do not assign file tags to files in bundledqt.qbsIvan Komissarov2021-02-101-0/+2
| | | | | | | | | | | | | | Otherwise, Qbs tries to moc Qt headers Change-Id: I6d2c340f7e419688f1aed69aaaa7da563cf98f75 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | qt6: also install core5compat when using bundled QtIvan Komissarov2021-02-101-0/+5
| | | | | | | | | | Change-Id: I249daeb8d4f12bf2dfe49ad354c1bef7dfa0cb59 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | doc: Add mention about missing `bare-metal` architecturesDenis Shienkov2021-02-094-3/+13
| | | | | | | | | | | | Change-Id: I68abceabdbc6acf776cc5b5b349ba44d73e4376a Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add '-nostdlib' flag for MSP430 GCC toolchainDenis Shienkov2021-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | ... to pass the C++ tests. Because we don't use the linking with the standard libraries in a tests, otherwise linking will fails. Change-Id: Ibde09c384fb70626109b357144a7e27a1a6b6e5b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | qt6: do not use QHash in ModuleLoaderResultIvan Komissarov2021-02-084-9/+19
| | | | | | | | | | | | | | | | Otherwise, Qbs crashes in TestApi::multiplexing when inserting into this hash Change-Id: Idcb136e6f9af1036c7b725e67508b0b677a9cb20 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add XTENSA architecture for GCC compiler to CIDenis Shienkov2021-02-083-2/+6
| | | | | | | | | | Change-Id: I810f6b6c263a1b5ade0ece35e57f6ad30b2864ed Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | qt6: fix crash in ItemReaderVisitorState::readFileIvan Komissarov2021-02-081-1/+1
| | | | | | | | | | | | | | | | | | In qt6, QHash::operator[] invalidates the reference stored in ProcessingFlagManager. However, std::unordered_map guarantees the stability of references, so use it instead of QHash Change-Id: I771ee0fe8b0581407376f60b03c1624ab9eaa7b9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | GiHib actions: increase test timeoutIvan Komissarov2021-02-082-11/+11
| | | | | | | | | | Change-Id: I5f626276d20c9912bfc30ac7e392335479e057ce Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | protobufcpp: add linkLibraries option to disable modifiying linked libs + ↵Jan Blackquill2021-02-061-4/+15
| | | | | | | | | | | | | | | | | | | | include paths This allows one to use Qbs' support for protoc without causing libprotobuf/libgrpc to be linked automatically, which is useful for when you want to build libprotobuf/libgrpc as part of your project. Change-Id: Ia40ebf6d79682b4ed88631f0ea540eeb6aad0bff Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Add HCS08 architecture for SDCC compiler to CIDenis Shienkov2021-02-051-0/+2
| | | | | | | | | | Change-Id: I04ad353b32f9816f05be24293ba0f64f1aea0e83 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Pass tests for ColdFire architecture for IAR toolchainDenis Shienkov2021-02-053-0/+26
| | | | | | | | | | | | Change-Id: I7ff8886cb14dee195a6d5af9173ca853f8455bed Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Pass tests for RISC-V architecture for IAR toolchainDenis Shienkov2021-02-053-0/+17
| | | | | | | | | | Change-Id: I9a7a0239370ff3d309dc91868b2058cc6616149c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Derive test application and library from base productDenis Shienkov2021-02-053-228/+131
| | | | | | | | | | | | | | | | | | | | It makes sense to store platform-specific flags in one place, for example, in BareMetalProduct. And then to inherit the applications and the libraries from this common product. This solution minimizes the copy/paste errors and make a tests code easier to maintain. Change-Id: Iaf11be9d6f983e8ce542787d42e8b7ef050b1903 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 05:27:26 +0000