aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docker: fix PATH in android imagesIvan Komissarov2020-06-092-3/+3
| | | | | | Change-Id: I5856b6d6edcf37a9af9dada72271caff60f311f2 Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix '-Wclazy-range-loop' warningsIvan Komissarov2020-06-087-9/+12
| | | | | | | The warning says 'c++11 range-loop might detach Qt container' Change-Id: I6b6a91d6b3298702246da94f05d21623d5f13faa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix TestBlackboxExamples with iOS profileIvan Komissarov2020-06-089-14/+23
| | | | | Change-Id: Ic5b37c323c726227311d5c0c73477da8043e3315 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Add support for Compact Risc architecture to GCC toolchainDenis Shienkov2020-06-081-0/+2
| | | | | | | | | This patch adds the Compact Risc architecture (aka CR16): * https://en.wikipedia.org/wiki/CompactRISC Change-Id: I1bfc4639c69db55205aafaed6150fa0ad566eb16 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Add support for Renesas SuperH architecture to GCC toolchainDenis Shienkov2020-06-071-0/+2
| | | | | | | | | | This patch adds the SuperH architecture, provided by Renesas: * https://www.renesas.com/us/en/products/microcontrollers- microprocessors/superh.html Change-Id: I60fbdc8ce5df55f61d6960a5360a6e026b190ab2 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Add support for Renesas RX architecture to GCC toolchainDenis Shienkov2020-06-071-0/+2
| | | | | | | | | | This patch adds the RX architecture, provided by Renesas: * https://www.renesas.com/us/en/products/microcontrollers- microprocessors/rx/rx-features.html Change-Id: I2aa7e6adc6b72329f18dc89856c33f2b2d9094e8 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Android: Add option to use aapt2 instead of aapt in Android.sdk moduleRaphaël Cotty2020-06-044-33/+374
| | | | | | | | | | | aapt has been deprecated (https://developer.android.com/studio/command-line/aapt2) and replaced by aapt2. PropertyOption aaptFileName allows those value: "aapt" and "aapt2". Default value is set to "aapt" for the moment. Fixes: QBS-1562 Change-Id: I1970cafaa54a0e035c08ffe5f9967b712f5c5253 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: use \qmlmodule for ProbesIvan Komissarov2020-06-0311-12/+11
| | | | | | | | This fixes qdoc warnings like that: "Could not resolve QML import statement for type 'PathProbe'" Change-Id: I839ddd2c702b1d56d2209c0eba4e3e44f2178364 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GCC: avoid duplicating framework paths in the resulting commandIvan Komissarov2020-06-021-1/+1
| | | | | | Fixes: QBS-1552 Change-Id: Ifc9f6bbeaa3ba145e3340b6c440f61120d693c91 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProductData: return members by const-referenceIvan Komissarov2020-06-0220-66/+50
| | | | | Change-Id: I865d28b8fd930820c7145a3bf8aa76b2dd677550 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* XCode: fix handling provisioning profiles in dry-run modeIvan Komissarov2020-06-022-2/+2
| | | | | | | | | | Build in dry-run mode failed with "no such file..." because provisioning profile is not copied to the build directory. This amends 92970c2. Change-Id: I7c278376425c9982b9b402fd6071fac7847d3d2e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Remove extra \endtable tag because it is typoDenis Shienkov2020-05-311-1/+0
| | | | | Change-Id: I2b03952f7c051243c70c512b3185ac1f2d73d4f7 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* TestBlackbox: Fix wrong indentationChristian Kandeler2020-05-291-1/+2
| | | | | Change-Id: Ieb50d47c722c52b3affa8bab6d43d14f16f36375 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Fix TestBlackboxExamples for environments without QtChristian Kandeler2020-05-295-21/+26
| | | | | | | The same way as TestBlackboxQt does. Change-Id: Ic040eb3d4c0f5946ca24978090bf342121280260 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Add blackbox examples testIvan Komissarov2020-05-289-2/+199
| | | | | | | | | | It is necessary to build examples with different profiles pretty much like it is done with other tests. Thus, build examples as a separate blackbox test. Change-Id: If4e910fb60a6d51e1a0c690e7a4ece4b17bd5b95 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Msvc: Handle windows module definition fileDenis Shienkov2020-05-269-2/+148
| | | | | | | | | | | | | | | | | | | Module-definition (.def) file provide the linker with information about exports, attributes, and other information about the program to be linked. This file can be used instead of e.g. __declspec(dllexport) keywords inside of a header files to export an appropriate symbols: * https://docs.microsoft.com/en-us/cpp/build/reference/module-definition-dot-def-files?view=vs-2019 * https://docs.microsoft.com/en-us/cpp/build/reference/def-specify-module-definition-file?view=vs-2019 To make it supported, we have created the additional 'def' file tag, and now we can add the required module-definition file to the {Product|Group}'s 'files' property. Fixes: QBS-571 Change-Id: I831d2e1b8f9f061a4414a5eaac85b71584f48c5d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use md5 tool on macOSRichard Weickelt2020-05-251-2/+3
| | | | | | | | | The md5sum tool is not available on macOS by default. Travis has it, but most systems do not. There is a md5 tool instead, which can produce compatible output. Change-Id: I64c205757effda85920d10a717ecc70e0dad6c91 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix '-Wclazy-qstring-left' warningIvan Komissarov2020-05-251-1/+1
| | | | | | | | The warning says 'Use QString::at(0) instead of QString::left(1) to avoid temporary allocations (just be sure the string isn't empty).' Change-Id: I4ef427c4a60e7f9e40a16b3e8b64ea13e167f1ee Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Add mention about new supported National Semiconductor CR16 architectureDenis Shienkov2020-05-251-0/+4
| | | | | | | Change-Id: I9d302ce52b9fc280dff56c9f3fc51edf04ab5d1e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Auto-detect IAR toolchain for National Semiconductor CR16 ↵Denis Shienkov2020-05-251-2/+6
| | | | | | | | architecture Change-Id: I9b324380ed5f437c1a1cd43bab22a61223ffd18c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Add IAR National Semiconductor CR16 toolchain supportDenis Shienkov2020-05-251-5/+17
| | | | | | | | | | | This commit adds a basic support of the IAR Embedded Workbench toolchain for the National Semiconductor CR16 processors family: * https://en.wikipedia.org/wiki/CompactRISC Change-Id: Idb241341a450ea5669e43c0ae7c0338be43ec16a Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Add mention about new supported Renesas M16C architectureDenis Shienkov2020-05-251-0/+4
| | | | | | | Change-Id: I454afa13b6b693f5818d207ab06927c9df1a0c01 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Auto-detect IAR toolchain for Renesas M16C/R8C architectureDenis Shienkov2020-05-251-2/+7
| | | | | | Change-Id: I3f5822316d328e8861e54d43994de405c591c0b3 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Add IAR Renesas M16C/R8C toolchain supportDenis Shienkov2020-05-251-4/+14
| | | | | | | | | | | This commit adds a basic support of the IAR Embedded Workbench toolchain for the Renesas M16C/R8C processors family: * https://www.renesas.com/us/en/products/microcontrollers-microprocessors/m16c.html Change-Id: I1985d16bd74434d78b2f571a209d314f5c147361 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Auto-detect IAR toolchain for Renesas R32C architectureDenis Shienkov2020-05-251-2/+6
| | | | | | Change-Id: I218136517821325b69af5893589b028570bc22c9 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Add mention about new supported Renesas R32C architectureDenis Shienkov2020-05-251-0/+4
| | | | | | | Change-Id: I00b2063807943a32ff23f0bb26b642430036f973 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Add IAR Renesas R32C toolchain supportDenis Shienkov2020-05-251-5/+18
| | | | | | | | | | | This commit adds a basic support of the IAR Embedded Workbench toolchain for the Renesas R32C processors family: * https://www.renesas.com/us/en/products/microcontrollers-microprocessors/m16c.html Change-Id: I8f6cd1025df63f7521e3e7ac7e6d21570f320085 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* baremetal: Add support for Renesas M32R architecture to GCC toolchainDenis Shienkov2020-05-252-0/+7
| | | | | | | | | | | This patch adds a new M32R architecture, provided by Renesas: * https://www.renesas.com/eu/en/products/microcontrollers-microprocessors/m32r.html Change-Id: I4f1550b00a2bd651c88c0b58fc250e3f65405406 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectData: return const values/referencesIvan Komissarov2020-05-258-34/+26
| | | | | | | | | | | Qbs does not care that much about binary compatilibity (because of qbs session) and thus is is preferable to return members by const-ref (saving 2 atomic operations and preventing from accidental detaches). In case when method needs to compute some value instead of returning member directly, the function signature can be changed. Change-Id: I4e8d228761a990d274e77652c94adf9f43a758f1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge "Merge branch '1.16'"The Qt Project2020-05-223-23/+14
|\
| * Merge branch '1.16'Ivan Komissarov2020-05-203-23/+14
| |\ | | | | | | | | | Change-Id: I9920b1dc853c8c0051e5c5be5e570c2ca38880e6
| | * Fix protobufobjc.qbs1.16Ivan Komissarov2020-05-191-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qbs complained about using undefined as a value for cpp.includePaths if objc module was not found Also, get rid of the Properties items as they are not reliable in modules Change-Id: Ifd0088e8a6da09f4befc20a43e8d7da7f32fcf31 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Remove deleting trailing slash from VS env varsSergey Zhuravlev2020-05-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After launching msbuild from QBS I got an error "LOGGERBASEDEXECTASK : ILC error ILC1004: Directory 'C:\Program Files (x86)\Windows Kits\10lib\10.0.15063.0\um' passed to argument 'targetplatformsdklibpath' does not exist.". Seems those trailing slashes are important. Change-Id: I2839d7054c866207bbaeef3e21a4ea6a9679f477 Fixes: QBS-1551 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| | * Do not use undefined properties in protobufcpp.qbsIvan Komissarov2020-05-191-4/+8
| | | | | | | | | | | | | | | Change-Id: Ie3a65702ba7604984bc3c4d456a2c6999e1d4925 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | | Fix or skip tests to be able to run with the iOS profileIvan Komissarov2020-05-2264-165/+784
|/ / | | | | | | | | | | | | | | | | | | | | | | This skips tests that are not possible to run without the device and fixes other tests for the iOS profile. Also, adds Travis job that runs tests using iOS profile. This is the squashed merge commit of the wip/ci-ios branch. Change-Id: Ia0c1fc05fdb8c6e269f5e66f979f2ae19465433c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | XCode: fix handling provisioning profilesIvan Komissarov2020-05-201-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The abuse of the file tags to pass additional information to the prepare script is not working anymore, so set a fake module property instead. Also, automatically tag all provisioning profiles located in xcode.provisioningProfilesPath. Also, do not raise error if user did not provide any *.entitlements files. This patch fixes deploying the iOS application to the device Change-Id: I9356af334a928099d59f747d6f186634df8168d3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Travis: Generate debug information on macOS and Linux onlyRichard Weickelt2020-05-202-3/+2
| | | | | | | | | | | | | | | | | | Generating debug information disables clcache on Windows and results in a 10 minutes longer build time. Change-Id: Ibd13c3017c60d09074ab22b1933acd9a331bd61e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add --system to qbs-setup-androidChristian Gagneraud2020-05-203-2/+10
| | | | | | | | | | | | | | | | This allow to have android settings install system wide, similar to qbs-setup-qt and qbs-setup-toolchains. Change-Id: Idc01e0ebe6e3f6f17b2e48e84f6fe2b0e95f0c63 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Pass '--cpu' flag at ARM predefined macros dumpingDenis Shienkov2020-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | ... using the KEIL toolchain. Since KEIL MDK v5.30 the 'armcc' compiler require the '--cpu' property be set. So, as a workaround we pass the default 'cortex-m0' property (by analogy with the 'armclang' compiler). Change-Id: I334f3cbb801eaf2f3958b59afbddbf5f026066ee Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | doc: Add mention about new supported Renesas M32C architectureDenis Shienkov2020-05-191-0/+4
| | | | | | | | | | | | | | Change-Id: Idbae1dcc9223bbc975c7139d1d3f994dc66a4ea4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Auto-detect IAR toolchain for Renesas M32C architectureDenis Shienkov2020-05-191-2/+7
| | | | | | | | | | | | Change-Id: I1c7deb28a34c5259b9b8f5c55cd84696ba68204b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add IAR Renesas M32C toolchain supportDenis Shienkov2020-05-191-4/+13
| | | | | | | | | | | | | | | | | | | | | | This commit adds a basic support of the IAR Embedded Workbench toolchain for the Renesas M32C processors family: * https://www.renesas.com/us/en/products/microcontrollers-microprocessors/m16c.html Change-Id: I87026acbf83a204ceb9821271038582f8f6e7ae5 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add support for Renesas M32C architecture to GCC toolchainDenis Shienkov2020-05-191-0/+2
| | | | | | | | | | | | | | | | | | | | This patch adds a new M32C architecture, provided by Renesas: * https://www.renesas.com/us/en/products/microcontrollers-microprocessors/m16c.html Change-Id: Ibed0ffb36f6b782ab77829fe3c527b2e07b76259 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | build-qbs-with-qbs.sh: Add more flexibility for the autotest profileIvan Komissarov2020-05-191-10/+22
| | | | | | | | | | | | | | | | | | | | This patchset adds QBS_AUTOTEST_QMAKE_PATH and QBS_AUTOTEST_BASE_PROFILE variables that could be used to configure the profile that is used when running autotests Change-Id: Ifc32d397c08eefb7e8b96cf387031db2ab693cbc Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Rename .qbs files in examples to match catalog structureIvan Komissarov2020-05-1815-12/+11
| | | | | | | | | | Change-Id: I66996ff2b3e8dcb50b24ad92dffd0651322653e9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix clang 10 warnings about loop assignmentsChristian Kandeler2020-05-181-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | tests/auto/language/tst_language.cpp:539: warning: loop variable 'p' has type 'const qbs::Internal::ResolvedProductConstPtr &' (aka 'const shared_ptr<const qbs::Internal::ResolvedProduct> &') but is initialized with type 'const std::shared_ptr<qbs::Internal::ResolvedProduct>' resulting in a copy [-Wrange-loop-construct] for (const ResolvedProductConstPtr &p : mainProduct->dependencies) { ^ Change-Id: Ie576a245d7aad5d4dcfac32f5394b18f05e862d5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Add QT_NO_DEBUG macro when using "profiling" buildVariantIvan Komissarov2020-05-181-3/+3
| | | | | | | | | | | | | | Otherwise, assertions are enabled which slows down the application Change-Id: I63bf5428ff55f1245307d79f27dcd156e7ff79cc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | doc: Extend description of 'm68k' architectureDenis Shienkov2020-05-181-1/+2
| | | | | | | | | | | | Change-Id: I222a4de86bd131a21c28ed343cfc56348765ef0d Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Auto-detect IAR toolchain for ColdFire (aka M68K) architectureDenis Shienkov2020-05-181-2/+6
| | | | | | | | | | | | Change-Id: Iad69544737cbca42d69cddaa182bf3aba97a770f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add IAR ColdFire (aka M68K) toolchain supportDenis Shienkov2020-05-181-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a basic support of the IAR Embedded Workbench toolchain for the NXP ColdFire processors family: * https://www.nxp.com/products/processors-and-microcontrollers/legacy-mcu-mpus/32-bit-coldfire-mcus-mpus:PC68KCF This ColdFire architecture is an enhancement to the previous M68K architecture. Change-Id: Idb4c0cee5ca5a09fe8a070ee32212de68e0e7e78 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 03:02:11 +0000