aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Install qtcreator from the official release packagesRichard Weickelt2020-11-213-10/+8
| | | | | | | | | | Previously the script used the packages of the online installer. Since all old QtCreator releases have been removed from that repository, we switch to the official release packages which provide .7z files containing prebuilt binaries as well. Change-Id: I5ebf3420ffa25043796f09403ea47cd7f026b602 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* macOS: Fix getNativeSetting() test on Big SurIvan Komissarov2020-11-201-4/+8
| | | | | Change-Id: I585fe2646339a7d7454570638bef2ad5e9ab502a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: fix macOS buildIvan Komissarov2020-11-201-1/+1
| | | | | Change-Id: Idc99e0546748f4eabd9bb0cc1bc8ce5a29758382 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Doc: Fix type of installDebugInformation propertiesJochen Ulrich2020-11-192-2/+2
| | | | | Change-Id: I5c3a7898b61f8892a2de4414de64f40e5f9f537b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Update sdk/ndk/tools versionsRaphaël Cotty2020-11-183-17/+17
| | | | | | | | | build-tools: 29.0.3 NDK: 21.3.6528147 SDK Platform: 29 Change-Id: I6d281aa2e914d7567fa2d57698146465b41838d7 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Fix dumping of compiler includes for IAR toolchainDenis Shienkov2020-11-181-6/+3
| | | | | Change-Id: I176db33bcd1ea270e890f8422d10bc5133c891bf Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Android: Update for Qt 6Raphaël Cotty2020-11-179-92/+255
| | | | | | | | | | Manage the new directory layout of Qt6. Update generation of the input file for androiddeployqt. Fixes: QBS-1613 Fixes: QBS-1609 Change-Id: Ie633fad467f310bfc4cd42e9c32d9cfc2e734582 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Fix parsing compiler definesIvan Komissarov2020-11-171-3/+5
| | | | | | | | | We should not stop at the second space but include the rest of the string. Change-Id: I94d18fb0aed968ab8ecd2b46fbb22d3cba89ac88 Fixes: QBS-1621 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: fix macOS buildIvan Komissarov2020-10-292-2/+3
| | | | | | | | Default Xcode was switched to 12.0 and we need to use Qbs 1.17 which supports it Change-Id: I4dfb0da7e1bdf99dd1fafe952395465dc8cdb267 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Implement missing check for allowed values in PropertyOptionsIvan Komissarov2020-10-2812-13/+170
| | | | | | | | | | | | | | ========== Performance data for Resolving ========== Old instruction count: 10195378481 New instruction count: 10238464294 Relative change: 0 % [ChangeLog] Qbs now checks string and stringList values according to the allowedValues property in PropertyOptions Change-Id: Ide88987c74b35f4172ffaf71aacd991536131ee5 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use make_shared to create ValuesIvan Komissarov2020-10-272-11/+12
| | | | | | | Should save some allocations. Requires making ctors public. Change-Id: I9d8a14a1c2edf374add0fdae914a028f9987d216 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: do not print profiles in scriptIvan Komissarov2020-10-271-2/+0
| | | | | | | We print them in the "Setup Qbs" step Change-Id: Ib523770b9d93882fdab64a7a74a807abbd2cd248 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: Add ios-simulator jobIvan Komissarov2020-10-261-0/+6
| | | | | Change-Id: I818164b62bd75579771a5caf3a74be796e253c54 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Xcode: fix apple-multiconfig test for ios-simulatorIvan Komissarov2020-10-261-2/+2
| | | | | Change-Id: I0db7d7104cd06521291970a51ddf0a6f55cc71a6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add Android Docker image containing Qt 5.15Richard Weickelt2020-10-262-0/+16
| | | | | | | Add also a job for github actions. Change-Id: Ibf4b1740379605f32ead66657bc4b81529089cc9 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Fix qbs.buildVariant in appleMultiConfig() testIvan Komissarov2020-10-262-10/+10
| | | | | | | Should be "profiling", not "profile" Change-Id: I79f1607a4a1880a67bb49b08dfabbe0a5715aaa7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge branch '1.17'Ivan Komissarov2020-10-268-49/+97
|\ | | | | | | Change-Id: Ifcd65b201f060506d53dcffc0031d186a6dc227e
| * Xcode: fix compilation for ios-simulator with Xcode 12v1.17.11.17Ivan Komissarov2020-10-262-1/+10
| | | | | | | | | | | | | | | | The triplet -target x86_64-apple-ios-macho is no longer valid, it should be -target x86_64-apple-ios8.0-macho Change-Id: Ib7ce96100e1751625784db7385b44c53a2747e07 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Add changelog for 1.17.1Richard Weickelt2020-10-231-0/+9
| | | | | | | | | | Change-Id: Ie4584b39080db3e2d2b87ca0fa1b73a6f807ef97 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 00:09:17 +0000