aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* travis: install cap'n'proto packages in Bionic imageIvan Komissarov2020-07-282-1/+3
| | | | | | | This allows to run capnproto tests on Linux Change-Id: I1c500063f13f4aecc16c088f91d3ce790c750abf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* protobuf: remove deprecated propertiesIvan Komissarov2020-07-272-9/+2
| | | | | Change-Id: I871b7f46ffab880fa2a2762c2339907fe7d01f88 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge "Merge branch 1.17 into master"The Qt Project2020-07-2783-65/+2326
|\
| * Merge branch 1.17 into masterRichard Weickelt2020-07-2483-65/+2326
| |\ | | | | | | | | | Change-Id: Ice408bd77aa9f6481960c4fdf7f345a1a39b9f80
| | * doc: Provide a complete example in the "Installing Files" sectionIvan Komissarov2020-07-241-7/+36
| | | | | | | | | | | | | | | | | | Fixes: QBS-1350 Change-Id: I86cf583ea8cd54041c17a8656913702aab7fc35d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Fix setting isBundle:false on macOS in config-ui.qbsIvan Komissarov2020-07-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Despite the fact that the second Properties item is not evaluated on macOS, this "works" because isBundle is set to undefined (which is false) due to a bug with Properties. Set isBundle:false explicitly for macOS as well. This amends 1eff548646 Change-Id: Ifd5bc3b656a0eff02914e4fe43945b0e8b0f04fe Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * baremetal: Pass 'one-object-asm-application' test for KEIL C166Denis Shienkov2020-07-242-0/+9
| | | | | | | | | | | | | | | Change-Id: I8e5ffc2340135e53021d95c3079f6dc458dc1459 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * baremetal: Pass 'one-object-asm-application' test for KEIL MCS251Denis Shienkov2020-07-232-0/+10
| | | | | | | | | | | | | | | Change-Id: I2b6b4618e2ddf2cc58f4c2f6c9776a5d6fac9b9f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * baremetal: Skip 'preinclude-headers' test for KEIL C251 and C166Denis Shienkov2020-07-231-1/+3
| | | | | | | | | | | | | | | | | | | | | ... because this toolchains does not support the pre-include headers. Change-Id: I3a56389d9bdc7ca05a8e274caa9f01fb9fb52afc Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * baremetal: Pass 'one-object-asm-application' test for GCC XTENSADenis Shienkov2020-07-232-0/+13
| | | | | | | | | | | | | | | Change-Id: Ic01a2720a9184daa80c83ed8d53809f6f50d9258 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * baremetal: Pass 'one-object-asm-application' test for IAR AVRDenis Shienkov2020-07-232-0/+9
| | | | | | | | | | | | | | | Change-Id: Ide33b5ad139ed18f45e9feff6093ae903d828ee7 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * baremetal: Pass 'one-object-asm-application' test for IAR MSP430Denis Shienkov2020-07-232-0/+8
| | | | | | | | | | | | | | | Change-Id: I7d0d6906c7b54e1c936e23f4860174f45d89d787 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * baremetal: Pass 'one-object-asm-application' test for IAR STM8Denis Shienkov2020-07-234-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | ... also the changes in the BareMetal{Application|StaticLibrary}.qbs files allows to pass all other IAR STM8 tests. Change-Id: Ic4e36e0e1a19863d2c9172a17e4bcfc5da7e3a34 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * baremetal: Pass 'one-object-asm-application' test for IAR ARMDenis Shienkov2020-07-232-0/+17
| | | | | | | | | | | | | | | Change-Id: Ie4dee42345d4ca1d3280b1b65155d0dc173beffd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Fix CONFIG variable being read incorrectly in setup-qt.jsMitch Curtis2020-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_CONFIG was read in the line before CONFIG, and the regex matched it: QT_CONFIG += private_tests shared shared [...] CONFIG += shared shared debug sanitize_address sanitizer This would lead to address sanitizer being ignored and requiring workarounds. Use a stricter regex that doesn't allow arbitrary characters before the key. The regex can be tested manually here: https://regex101.com/r/aYSWwG/2 Change-Id: I8b6a509d0fdd9500c527497fa3545646f24c42d1 Fixes: QBS-1387 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * Android: Do not fail if project contains multiple shared librariesAlberto Mardegan2020-07-211-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do not fail the detection of the main binary if the first two candidates do not match the product name. Simplify the logic to exclude all non-matching candidates except the first one. Change-Id: I5046d7e103a9130c602aa8991bb9853c6ff593dd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Add support for Cap'n Proto for the c++ languageIvan Komissarov2020-07-2128-0/+1668
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cap'n Proto is a 'cerialization protocol' similar to protobuf: https://capnproto.org/index.html This patch mainly focuses on the c++ support for the capnp protocol keeping in mind the possibility to add other languages later. Change-Id: Ib19a9df1f45f2787503197791ac597d06cc45e9d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * baremetal: Pass 'one-object-asm-application' test for GCC MSP430Denis Shienkov2020-07-212-0/+16
| | | | | | | | | | | | | | | Change-Id: Icad69d9f510d09f7e157ef410383f5d39e36f1a6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * xcode: Fix Xcode 12.0 supportIvan Komissarov2020-07-203-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | The *.xcspec files for macOS were moved into the *.ideplugin directory similar to how it is done for iOS/tvOS/etc. Fixes: QBS-1582 Change-Id: I478742c4b52b08f7feee4108272da7bf2b12a744 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * baremetal: Pass 'one-object-asm-application' test for SDCC STM8Denis Shienkov2020-07-202-0/+9
| | | | | | | | | | | | | | | Change-Id: Ifa011d1fe35870b0f5808833fa785259e9ba2cb4 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * Tests: Fix linking of tests when using bundled QtScriptChristian Stenger2020-07-201-1/+0
| | | | | | | | | | | | | | | | | | Change-Id: Ifd57049c89df83fc5ca9a8cac35af5a16635b312 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * baremetal: Skip 'preinclude-headers' test for KEIL MCS51 toolchainDenis Shienkov2020-07-162-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | ... because this toolchain does not support the pre-include headers. Change-Id: I3b34a39da01500540cbaca62244104c8262875fc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * baremetal: Don't pass cpp.driverFlags to KEIL assemblerDenis Shienkov2020-07-163-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... because the cpp.driverFlags intended only for the compiler and the linker; the assembler required the cpp.assemblerFlags instead. Change-Id: Ie1cca820d54095fc1361f5b9b049adc57674b3fd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * baremetal: Don't pass cpp.driverFlags to IAR assemblerDenis Shienkov2020-07-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... because the cpp.driverFlags intended only for the compiler and the linker; the assembler required the cpp.assemblerFlags instead. Change-Id: I0758937d40f02cbc6ff76b36b7c11fe5f4ddcf08 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * baremetal: Don't pass cpp.driverFlags to SDCC assemblerDenis Shienkov2020-07-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... because the cpp.driverFlags intended only for the compiler and the linker; the assembler required the cpp.assemblerFlags instead. Change-Id: Ib2b70b349517dfa7d125e3c15491e2f4a870a95d Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * Fix mingw linker issueOliver Wolff2020-07-161-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: I4890eb09182446eb4df0e0c1ab8a6ab0cda1e6cd Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Fix loading optional transitive dependenciesIvan Komissarov2020-07-169-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If optional module B depends on an invalid module A (i.e. whos validate script throws an exception), module B should be not present as well. Fix that by remembering the initial value of the "required" property in the Depends item. Change-Id: Ia21587b3f5a8bd49c12b9f31b65e009fb2eeafb9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Probes: Remove nameFilter from FrameworkProbeIvan Komissarov2020-07-164-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not possible to use functions as values for properties with the new JS engine. Remove nameFilter by allowing to have common nameSuffixes for different selectors. Change-Id: I24ae747f4d609c956285e77ee832c6e99304a622 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Probes: Remove deprecated properties from PathProbeIvan Komissarov2020-07-151-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | They were declared deprecated in qbs 1.13, looks like it's safe to remove them. Change-Id: I493f7bb9578da1bb579161338bcb5d391cc15f4c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * doc: fix the default value for the qbs.targetPlatform propertyIvan Komissarov2020-07-151-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I013c19555af224e2f2ac39af37c63c8869109243 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * doc: Add How-To about cpp.rpathsIvan Komissarov2020-07-159-0/+329
| | | | | | | | | | | | | | | | | | Task-number: QBS-1204 Change-Id: I2d04ccb0cbcd7c1a6b5a5f251e70d34b3a960da7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * baremetal: Pass 'one-object-asm-application' test for GCC AVRDenis Shienkov2020-07-142-0/+8
| | | | | | | | | | | | | | | Change-Id: I7f355bf7a366e58c68aea449f9afe08e63db9f4e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * baremetal: Pass 'one-object-asm-application' test for GCC ARMDenis Shienkov2020-07-142-0/+8
| | | | | | | | | | | | | | | Change-Id: I1cb87180484e17a2eee025fb1f4fada0b399128e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * ci: Fix borked Python environment on macOSIvan Komissarov2020-07-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like multiple Python3 environments are installed and running pip3 attempts to run a non-existent python3 binary. The recommended workaround is to invoke pip as a python module. Change-Id: I0bf2e47fa11b3c1014706960f5a34a85f64fa166 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Richard Weickelt <richard@weickelt.de>
| | * protobuf: Do not call outputDir() that oftenIvan Komissarov2020-07-133-10/+10
| | | | | | | | | | | | | | | Change-Id: I1f436eb2d15393fc010a4ab29f879ae0828b0cc3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * protobuf: use FileInfo.joinPaths instead of string concatenationIvan Komissarov2020-07-131-2/+3
| | | | | | | | | | | | | | | Change-Id: Id86b94f0ca333942a769d86ebed47b629a43cf03 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * baremetal: Pass 'one-object-asm-application' test for KEIL ARMDenis Shienkov2020-07-104-3/+15
| | | | | | | | | | | | | | | Change-Id: Id4e1c081fa8d6841fbad58532daee7d62ff80942 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * baremetal: Pass 'one-object-asm-application' test for SDCC MCS51Denis Shienkov2020-07-103-8/+11
| | | | | | | | | | | | | | | | | | Change-Id: I2b26c60bd5e9c84c917b58cddf45f25461313c66 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Bump version number to 1.18.0Richard Weickelt2020-07-241-1/+1
|/ / | | | | | | | | Change-Id: I9413e8c3c7ac49b8a6e77e4c01a0247ad8242228 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Bump required Qt versionChristian Kandeler2020-07-243-4/+4
| | | | | | | | | | | | | | | | ... to 5.14. We need >= 5.12 for a recent QRegularExpression patch, and 5.14 is also what Qt Creator is currently on. Change-Id: I674e7b617acaed2bf2f668a31f82e800f05ccfc8 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Replace QRegExp by QRegularExpressionChristian Stenger2020-07-2319-90/+97
| | | | | | | | | | Change-Id: I6c86565b8464efd0b7aec61c12879d3b95a5871c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Switch to Qt 5.15.0 and drop CI support for MinGW on LinuxRichard Weickelt2020-07-205-137/+35
| | | | | | | | | | | | | | | | | | | | | | Cross-builds with MinGW on Linux are dropped mainly because of build issues and because MinGW support bloats the resulting Docker image. We have CI jobs running on Windows with MSVC and Clang-cl which should be sufficient. Change-Id: Iac4e0eaf1270844836697bebf52f9c056457caaf Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix wrong array iterationRichard Weickelt2020-07-133-7/+6
|/ | | | | | | | | | It is not recommended to use 'for in' loops to iterate over arrays because additional properties in Array.prototype would be iterated over as well. For unknown reasons this is not the case when using QtScript, but it would be a problem when running on QJSEngine. Change-Id: I4404c03a6277dae471a9beb162b539edb9ace426 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Pass 'one-object-asm-application' test for IAR MCS51Denis Shienkov2020-07-092-0/+10
| | | | | Change-Id: I4c0a63d9ba06aec32cdc138be5aeb0078e55658f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Return 0 in ASM main function for KEIL MCS51 toolchainDenis Shienkov2020-07-091-3/+4
| | | | | Change-Id: I18ade9e8382c539ba1a29268f7101e656793541f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Replace '.asm' extension with '.s' extensionDenis Shienkov2020-07-082-1/+1
| | | | | | | | | | | ... for an assembler source files in a tests. Reason is that the '*.s' extension is a more popular, besides, this extension also requires for the GCC compiler for a future tests. Change-Id: I0dd764f76e8f9731ee96db110831392616ccae44 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* protobuf: make outputDir property "private"Ivan Komissarov2020-07-084-6/+6
| | | | | Change-Id: I0b6d77a6ca2333feafa67bfd904862fb318f05e6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Add 'one-object-asm-application' test for KEIL MCS51Denis Shienkov2020-07-073-1/+47
| | | | | | | | | This commit adds an auto-test which compiles an application using one asm-source main module to check that an assembler does work correctly. Change-Id: I38d512f62bab2e96781405632822f81c13673064 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Initialize Depends item in aggregator Product properlyRichard Weickelt2020-07-071-0/+2
| | | | | | | Default properties were not initialized, but we do it everywhere else. Change-Id: I43226b7e683efe9295f1d587e374ef786d602ddb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix wrong variable scope in protobuf.jsIvan Komissarov2020-07-071-1/+1
| | | | | | Change-Id: Ife096ede8ac7a929fb1ae2c7323c79258a0f1d8e Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 04:06:46 +0000