aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Android: Remove targetName suffix from QtApplicationRaphaël Cotty2020-10-234-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.14 target suffix is required for the multi arch packaging. This only affects android applications using Qt. The suffix can't be applied in QtApplication because a project using CppApplication and depending on Qt.core won't have it. Beside using targetName is error prone as the user can change it. So instead of using targetName for the suffix this patch adds the suffix when deploying the "android.nativelibrary" for packaging and only for Qt applications. Fixes: QBS-1608 Change-Id: I0704d5433c8a1d513dfdef71cecbc99ea5458181 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Android: Fix Qt 5.14 (and 5.15)Richard Weickelt2020-10-221-4/+6
| | | | | | | | | | | | | | Amends 2f5f049e. Change-Id: Ifa77899b3f5b206c1436f6ad6baea4c4d7a238ed Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * Android: Update for Qt 5.15Raphaël Cotty2020-10-215-42/+71
| | | | | | | | | | | | | | | | | | | | | | | | Use java.additionalClassPaths property to allow compilation of binding classes because starting with Qt 5.15 they depend on QtAndroid.jar Update AndroidManifest.xml with uses-sdk node using new properties Android.sdk.minVersion and Android.sdk.targetVersion because Qt 5.15 uses androiddeployqt to set it. Fixes: QBS-1580 Change-Id: I2fa5e77bb183be1b55e9dd9756fb7b6eb1f3c9d4 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * Android: Allow exporting of Qt modules by using importingProductRaphaël Cotty2020-10-214-3/+90
| | | | | | | | | | | | | | | | | | | | | | The product variable in the Export item refers to the exporting item. If a qbs property is changed (example: qbs.architecture for the multiplexing in Android) then the Depend failed because the qbs module was not loaded yet for the exporting item. Fixes: QBS-1576 Change-Id: I220c47b3094727fe169d3dccd244ab2785a782b7 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * Bump version to 1.17.1Richard Weickelt2020-10-131-1/+1
| | | | | | | | | | Change-Id: I42518663555a503e2bc3dea9b33fc604cbee51e2 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | clang-tidy: Apply modernize-use-nullptr fix-itIvan Komissarov2020-10-268-87/+88
| | | | | | | | | | Change-Id: I404ac10a14517763daf656dd38dd560534cbf1fa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Get rid of goto in InputArtifactScanner::resolveScanResultDependenciesIvan Komissarov2020-10-261-10/+17
| | | | | | | | | | Change-Id: I9220b1e6344e90401abf4fb91115e77a3a6c996f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | capnp: Make outputDir variable publicIvan Komissarov2020-10-264-3/+13
| | | | | | | | | | | | | | To be consistent with protobuf Change-Id: Ib31956797f7b1ebcf37ab511dee502436900d899 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Use make_shared in InputArtifactScanner::scannersForArtifactIvan Komissarov2020-10-261-4/+3
| | | | | | | | | | Change-Id: Ia38f08fb32b50761e7fb8642019aad39a25c1ef2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix documentation warningsRichard Weickelt2020-10-25135-163/+1
| | | | | | | | | | | | | | | | | | | | | | The \contentspage command is obsolet without replacement. It has not been working since Qt5.2. The link to the Qt resource system does not work locally and should point to the online page instead. Change-Id: Ib065cfd26c90b60d3cd3d72820b16c6601e80ad4 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | cmake: Replace symlinked directory with full contentCristian Adam2020-10-215-1/+4723
| | | | | | | | | | | | | | | | This will fix Qt Creator's build on GitHub Actions which fails on Windows bots at install time due to the symlinked directory. Change-Id: I765a65cf4e85650403600ac77c3f54633ac4eb02 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | cmake: Remove ccache magicEike Ziller2020-10-202-7/+1
| | | | | | | | | | | | | | | | | | | | | | Setting the compiler/linker prefix globally heavily interferes with other setups. For example it breaks compiling resources with rc.exe on Windows. Use CMAKE_C_COMPILER_LAUNCHER=ccache and CMAKE_CXX_COMPILER_LAUNCHER=ccache when calling cmake instead. Change-Id: Id7fa7a3ce8b19b658eee0b661c9dfa060c3d62c9 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Do not use ::add-path:: as it is deprecatedRichard Weickelt2020-10-183-7/+6
| | | | | | | | | | Change-Id: Iec454ad0a850652cb6bd40257c287f13120baca0 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Fix detection for IAR compiler include pathsDenis Shienkov2020-10-151-4/+5
| | | | | | | | | | | | | | | | We need to return an approproate compiler include paths depending on the language tag ('cpp' or 'c'). Change-Id: I5b526cf67a8e2300bf9302862ed67535866997ee Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Force C++14 to keep QtScript compilableChristian Stenger2020-10-132-1/+3
| | | | | | | | | | Change-Id: I239eb88f52eef6c6733f02a9d3b372999a9195de Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix typo in JSON API project build answerDenis Shienkov2020-10-111-1/+1
| | | | | | | | | | | | Change-Id: Ibe8ce04ce1d036f6b1bb167855d493e6fb3e52a4 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Travis: drop more jobsIvan Komissarov2020-10-091-118/+0
| | | | | | | | | | | | | | | | | | Leave only macos (since github is broken) and windows docker (which is not ported to github) Change-Id: Ibcc5805e80c5aacf5be152fb3fab20060a09db77 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | cmake: Fix issues with configuring locations on WindowsEike Ziller2020-10-092-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | Make DLL destination configurable independently of LIB destination. In Qt Creator we put DLLs into bin\, but LIBs into lib\. Fix installation of plugin DLLs by adding corresponding RUNTIME section. Fix setting PATH to Qt & Qbs libraries for BuildQbsResources. Change-Id: I5029e82b8822c7e3ad43afe69530b2d4e2f918b3 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | cmake: Make build output & install locations configurableEike Ziller2020-10-083-49/+56
| | | | | | | | | | | | | | | | So we can configure the right paths for direct inclusion in the Qt Creator build. Change-Id: Ie83eb402f0d9ce5f1ef32737921dc2ec8b43a315 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Fix usage of @VAR@ in info plist filesIvan Komissarov2020-10-087-2/+81
| | | | | | | | | | | | | | Fixes: QBS-1601 Change-Id: Iead18bf5fd25f965cf9f9748469f2469488eabc8 Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | cmake: Make it possible to use --prefix option when installingEike Ziller2020-10-061-7/+13
| | | | | | | | | | | | | | | | Use relative paths for install commands, otherwise the install prefix is fixed at configure time. Change-Id: I985105016803e3fa1dfbceecfa9ecfbb7fad068e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Merge branch '1.17'Ivan Komissarov2020-10-053-1/+99
|\| | | | | | | Change-Id: Ia8ac795b55ba18fd6d855a1f880c5e3caa66b742
| * Add new icon to chocolatey packagev1.17.0Richard Weickelt2020-09-012-1/+1
| | | | | | | | | | | | | | Fixes also the broken link in the nuspec file. Change-Id: I0da24c19eb388a8377772fa3f1115a6afba31777 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Add changelog for 1.17.0 releaseRichard Weickelt2020-08-251-0/+98
| | | | | | | | | | Change-Id: I13bb24c875a2a2fb3503ea5344171267b74bf706 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * baremetal: Fix compilation for KEIL ARM examplesDenis Shienkov2020-08-213-0/+9
| | | | | | | | | | | | | | | | | | We need to add the cpp.assemblerFlags property, because now the cpp.driverFlags property does not passed to the assembler. Change-Id: I9d7429126e4d99284fbe3307a4950904913af3d6 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add support for IAR toolchain to 'stm32f103' exampleDenis Shienkov2020-10-024-0/+240
| | | | | | | | | | Change-Id: I66810811b04d1fb7909ee0bb9975d1823ce6e9b6 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Add support for IAR toolchain to 'pca10040' exampleDenis Shienkov2020-10-014-0/+338
| | | | | | | | | | Change-Id: I78ba146f349018f77285e0fd5957fc49bfc03794 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Fix startup code for PCA10040 board using Keil toolchainDenis Shienkov2020-10-011-238/+111
| | | | | | | | | | Change-Id: I09d3d3edbcdb3d1e5ae82fce4d204a174dfda5bb Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Improve macros dumping for KEIL C51/C251/C166 toolchainsDenis Shienkov2020-09-301-126/+84
| | | | | | | | | | | | | | | | 1. We can write the required entries in a loop. 2. We can use the regular expressions to parse the compiler output. Change-Id: Idb8d9dca1b5ba3b1436e40333abf66b226cbdc9d Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Doc: add a how-to for disabling compiler warningsMitch Curtis2020-09-301-0/+32
| | | | | | | | | | Change-Id: Ic323ed03ecc3ab71ab69dc444183bb228c023c99 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Add missing target assembler flags for ARM architecture examplesDenis Shienkov2020-09-304-0/+26
| | | | | | | | | | Change-Id: If8a75095f98bf38f9cbd178d8ed857dfcb368833 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Add support for IAR toolchain to 'pca10001' exampleDenis Shienkov2020-09-304-0/+229
| | | | | | | | | | Change-Id: I2efcdf5009d0011ceb11e37451305c36f0f87475 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Add new example for Nordic's 'pca10001' boardDenis Shienkov2020-09-3012-0/+1040
| | | | | | | | | | | | | | | | | | | | | | | | This commit adds example for both PCA10001 and PCA10024 development boards (based on nRF51822 MCU) from Nordic Semiconductor. This example only blinks with the green LED and supports both GCC and KEIL toolchains. Change-Id: I5b77cfc45fee4b8d52d9cc1647f689b5e737c132 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | tests: Add missing 'std' namespaceDenis Shienkov2020-09-3018-28/+28
| | | | | | | | | | | | Change-Id: Ib3bba4468bdf8851e61f48eecea597ae552c7647 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | GitHub actions: fix tests on WindowsIvan Komissarov2020-09-301-0/+2
| | | | | | | | | | Change-Id: Ic9c812e2891426906fb4c911f03c5f5e0305159d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Fix compilation of 'pca10040' example using Keil toolchainDenis Shienkov2020-09-301-0/+3
| | | | | | | | | | Change-Id: I57bfbd5e6865527187661fb2fae8c47d49349dfc Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Remove cpp dependency from PathProbe blackbox testsRichard Weickelt2020-09-272-4/+1
| | | | | | | | | | | | | | | | This reduces execution time to 1s (was 10s) and simplifies PathProbe debugging because the cpp module contains probes as well. Change-Id: Iddd4de71143892d6815acbd1efff30f92d70a423 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | GitHub actions: Run tests with Xcode 12Ivan Komissarov2020-09-252-2/+12
| | | | | | | | | | Change-Id: I339f855629c0d7cebfb4481b5516d4bfc5b778d3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | xcode12: fix compiler warningsIvan Komissarov2020-09-251-4/+4
| | | | | | | | | | | | | | | | Clang says: "loop variable 'xxx' is always a copy because the range of type 'QJsonArray' does not return a reference [-Wrange-loop-analysis]" Change-Id: Ibb33f077dfaaf635300f6c75f6684d4a3d7632de Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Make protobuf.*.outputDir public againKai Dohmen2020-09-2413-20/+180
| | | | | | | | | | | | | | | | | | | | Make protobuf outputDir public again for usage with installSourceBase when creating/installing a separate proto-only library product. Make outputDir readonly since it should not be set by the user. Changed artifacts tag hpp to protobuf.hpp for better filtering. Change-Id: I8697e880aacfe4d3029fd6f547a5d8c1eee7ee7e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Handle cpp.enableDefinesByLanguage for SDCC toolchainDenis Shienkov2020-09-242-2/+17
| | | | | | | | | | | | | | | | | | We need to ignore the 'cpp' language because this compiler does not support it. Also if only one 'cpp' language specified, we need to return false for the 'found' property of a probe. Change-Id: Ic9f8b3e1ce06dde55b5a9bdc5c1018e039316cd7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Add WiFi AP example for ESP8266 MCU using GCC toolchainDenis Shienkov2020-09-248-0/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This example implements the non-connectable WiFi access point running on the ESP8266-WROOM-02 module: * https://www.espressif.com/sites/default/files/documentation/0c-esp-wroom-02_datasheet_en.pdf For compilation of this module requires the GCC-based proprietary (pre-compiled) ESP8266 NON-OS SDK: * https://github.com/espressif/ESP8266_NONOS_SDK Change-Id: I035e9d8dc621d0981783008fe12af378ee9b02e6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Implement cpp.generateCompilerListingFiles for ARMCLANGDenis Shienkov2020-09-234-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The ARMCLANG compiler does not support generating of the listing files. Instead, it is recommended to use the disassembler: * https://www.keil.com/support/docs/4152.htm Take a note that the disassembler does not work with the evaluation license! Change-Id: If8b45e40523015d27e4439cf00028815211338ed Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Android: Change the product property to importingProduct to allow exporting ↵Raphaël Cotty2020-09-214-3/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | Qt module The product variable in the Export item refers to the exporting item. If a qbs property is changed (example: qbs.architecture for the multiplexing in Android) then the Depend failed because the qbs module was not loaded yet for the exporting item. Fixes: QBS-1576 Change-Id: I220c47b3094727fe169d3dccd244ab2785a782b7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | tests: Add 'std' prefix for printf() in blackbox::configure testDenis Shienkov2020-09-181-1/+1
| | | | | | | | | | | | | | | | | | We need to use the 'std' namespace prefix for all functions from the <cstdio> header. Otherwise the compilation may fails on some toolchains (e.g. on Open Watcom). Change-Id: I7824d96a9d0432c65e73f957653c865fd3754641 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Mark helper commands without of descriptions as 'silent'Denis Shienkov2020-09-181-0/+3
| | | | | | | | | | | | | | ... to prevent the QBS warnings. Change-Id: Ia8859c40bb597a49a60bfe4255511b26df8b9af0 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | baremetal: Pass 'generate-linker-map' test for SDCC toolchainDenis Shienkov2020-09-173-12/+17
| | | | | | | | | | | | | | | | | | | | | | A problem is that the SDCC toolchain has not an option to disable the generation for the linker MAP file. So, we need to remove this file explicitly after the linking, when the cpp.generateLinkerMapFile property is in false. Change-Id: Ic1e5cb08066441b51d86aece09acd5fae91a83f2 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Remove the isBaseModule argument from loadModuleFile()Ivan Komissarov2020-09-172-9/+10
| | | | | | | | | | | | | | | | Pass the fullName to the isBaseModule() function so the value can be calculated where it is needed. Change-Id: I4f4574818fd335d67d72bf307276bacf18cfd89b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Do not use return argument in loadModuleFile()Ivan Komissarov2020-09-162-20/+22
| | | | | | | | | | | | | | | | | | Generally, return arguments make code harder to understand as they intoroduce unneseccary compexity and addidional states. Use std::pair and structured bindings to return the value. Change-Id: I7c387a346958e1df1174027574fa5797ee221429 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add protobuf.nanopb moduleKai Dohmen2020-09-167-29/+209
| | | | | | | | | | | | | | | | | | | | | | nanopb is a protobuffer implementation aimed for usage on microcontrollers. It uses its own generator scripts which are applied as a protoc-plugin. Generalized the doPrepare function to use the generator as a plugin. Change-Id: I43549f709f3cdff23c7bed84659636d18ea5fcf8 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-06-07 02:27:50 +0000