summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Add missing nanopb generator file extension on windowsKai Dohmen2020-12-171-4/+4
| | | | | | | | When using nanopb on windows the generator script has the ".bat" extension. Change-Id: Ia7a836784a0709d30dcf2e8b9c26c2a38b703c86 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Reorder toolchain-check to enable creating of clang-cl profileKai Dohmen2020-12-171-3/+3
| | | | | | | | | Since a clang-cl toolchain type will contain "msvc" and "clang-cl" the "clang-cl" branch would never be reached because the "msvc" branch will always be executed. Change-Id: I0a28d9044371b5242a1ad83c828b45915ed0626c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Fix qt4 binary path detectionv1.18.0Raphaël Cotty2020-12-141-1/+2
| | | | | | | | | | Commit e8b186610738a16fe8ddaacd39797d863828c7aa removed the use of QT_INSTALL_BINS property if QT_HOST_BINS doesn't exists to set the binaryPath. But qt4 needs it because QT_HOST_BINS doesn't exist. Change-Id: I3e5bc10d3b4839bd62a1202ff5cbc939f0a3b2b0 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add changelog for 1.18.0Richard Weickelt2020-12-141-0/+84
| | | | | Change-Id: I03747e6daca56434a2ba5aee45438c15243dd40d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix building .xcassetsIvan Komissarov2020-12-141-1/+1
| | | | | | | | | | | In several cases, actool can create an Info.plist file which is assigned "partial_infoplist" tag and incorrectly used as an output parameter for the "--output-partial-info-plist". Fix that by using the last element in the array which is prepended to the list of artifacts returned by actool in actoolOutputArtifacts() Change-Id: Ide41ceb0f984a5ded91d13b38cc019ab8d804586 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add TestBlackboxApple::appiconset testIvan Komissarov2020-12-1435-0/+341
| | | | | | | | | This test verifies the possibility to use "*.appiconset" assets for application icons Task-number: QBS-1627 Change-Id: I2480dcb76d046d91333295926db40cdd6d4c32bd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* protobuf: explicitly disable auto refcount for generated filesIvan Komissarov2020-12-141-0/+1
| | | | | | | | ...for objective-C. Otherwise, enabling this property on a product level breaks compilation of these files. Change-Id: Iddf1c12f580a22b751607a20bd10a79963f775f8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix assetCatalog test for macOS 11.*Ivan Komissarov2020-12-141-1/+2
| | | | | Change-Id: I94755e03572003275483a4bac95660a007dff0bc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: some tweaks to the CONTRIBUTING.mdIvan Komissarov2020-12-141-1/+1
| | | | | Change-Id: I3d155e3fa035b82f60d78f5988aec0001115c054 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Fix doc about bundle.indentifier and indentifierPrefixIvan Komissarov2020-12-141-4/+6
| | | | | Change-Id: If381b6fab70732a6d980bd1334b709b49e7e2734 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Probe for release and debug version of protobuf librariesKai Dohmen2020-12-122-4/+30
| | | | | | | | | | When cpp protobuf or nanopb gets compiled as debug build the library gets the suffix "d". The library probe will search for the release name and the debug name. If no library could be found let the user set the library name. Change-Id: I6574986e527fe4484935e58ccf45c86feee230e5 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* cmake: Pass python3 from CMake to QbsIvan Komissarov2020-12-112-3/+4
| | | | | | | | ...to avoid fuss with possibly different Python versions found by CMake and Qbs Change-Id: I887f8aed8ed52b2766c0c1c411525b433b21458a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* cmake: check for presence of lxml and bs4 python modulesIvan Komissarov2020-12-101-42/+77
| | | | | Change-Id: Ifeecfa25af36d022529c10e1914cf0dd36e8c82c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Github actions: Add workflow for building release packagesIvan Komissarov2020-12-092-43/+176
| | | | | Change-Id: I2c670dc514d9c28ecebbd88ffe5d7b63b1cf757c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: Fix path to qmake and qbs.buildVariant when building docsIvan Komissarov2020-12-091-1/+3
| | | | | Change-Id: Ie9cfe4bd59ef8b692c522b4af97f9919624b37b7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* cmake: Doc should depend on qbs_processlauncherIvan Komissarov2020-12-091-1/+1
| | | | | | | Amends b946dd352114e70bee5203ea02bb7be11f8ab998. Change-Id: I89b4fd32b1087f542678aab34a208e6c5eee9c12 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* cmake build: Fix dependencies of BuildQbsResourcesEike Ziller2020-12-091-1/+1
| | | | | | | | | | It requires qbs_processlauncher to exist, otherwise ERROR: Failed to start process launcher at '<path_to_build>/qbs_processlauncher': execvp: No such file or directory Change-Id: I1dc2760889f6f74b9371d89803ce3131a3494532 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* baremetal: Handle preprocessor flags for SDCC toolchainDenis Shienkov2020-12-081-0/+1
| | | | | Change-Id: I6a82b1334e3f8e160ea1a48181fe1ac438844c35 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Android: Fix debugging supportRaphaël Cotty2020-12-086-41/+14
| | | | | | | | | | | | | | | | | Add archSuffix to generate the library with the architecture name for Qt > 5.14 (before the lib was renamed which prevented debugging). Remove rpaths as they are not used on android and generate warnings. Update target and defines to comply with android's Build System Maintainers Guide. Remove stripping step in Qt.android_support as androiddeployqt actually does the stripping. Change-Id: I46a273c1cded753223c7b759670477815b625267 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix installing standalone loadable modulesIvan Komissarov2020-12-081-0/+2
| | | | | Change-Id: I0d233878a6f18d29e6228431fa6cbc3cde3c99a5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Cleanup and update information about QBS and IDEs integrationDenis Shienkov2020-12-081-12/+26
| | | | | Change-Id: Ieb36a6ba96666f07cd1c22383964f8ecd5acdd33 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: fix bundle.resources property typeIvan Komissarov2020-12-071-1/+1
| | | | | Change-Id: I5458b20c4105497b8f647a43299c3e727172577b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* JSON API: use fullDisplayName in dependencies arrayRaphaël Cotty2020-12-072-3/+3
| | | | | | | | | | | Change the dependencies array to use the product full display name instead of just the name. That allows clients to search for the multiplexed products using the dependencies json array of the aggregate product. Clients are then able to properly update the search path of the dynamic libraries generated in the multiplexed products. Change-Id: I3dd8b66e2cb637e501cbfe29c670c57c2cea5f7b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: install files when using build-qbs-with-cmake.shIvan Komissarov2020-12-071-1/+2
| | | | | | | This allows to test if install() commands are correct Change-Id: I68085a118b03e6c4095b636f219a60abcc237ee1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: fix get_update_path_command() functionIvan Komissarov2020-12-041-1/+1
| | | | | | | | | Quotes in the command break setting PATH Amends 9c8451e9a76f1173d4c7fa4d538e2ed676743110 Change-Id: I2d5b40d9b302007da45c57e2f86856e175263c49 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* cmake: fix setting QBS_APP_INSTALL_DIR variableIvan Komissarov2020-12-041-1/+1
| | | | | | | It should be set before used Change-Id: I133c7791f9efbb1f76e898109503e120b5adf18e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix that target was accessed before it was createdEike Ziller2020-12-043-10/+14
| | | | | | | Amends c21932163779bcfe4577ac2e3326b8c113884829 Change-Id: I078df77ebfd7921c9c8bcaf131ae06a3a1fcd181 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* cmake: fix path to qml resourcesIvan Komissarov2020-12-041-2/+2
| | | | | | | | This amends c21932163 Task-number: QBS-1618 Change-Id: I88f8d00d11603d7cc236531605511c92db3de9b0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Pass import paths as nanopb_opt to support `.options` filesKai Dohmen2020-12-035-2/+19
| | | | | | | | | | | To make use of nanopb specific options defined in a separate `.options` file pass import paths to nanopb generator script. This is needed because protoc doesn’t currently pass include path into plugins. Therefore if your .proto is in a subdirectory, nanopb may have trouble finding the associated .options file. Change-Id: I28eb2e9c2f353df88aa1a1e772dfb57a36800434 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* cmake: Fix building documentationIvan Komissarov2020-12-035-15/+79
| | | | | | | | It was never implemented Fixes: QBS-1618 Change-Id: I702410b546cacd439989268d3d4fbb18051d1819 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Disable moc for the aggregate product when multiplexingRaphaël Cotty2020-11-265-4/+36
| | | | | | | | | | | Running moc in the aggregate can't happen anymore because it generates an error when accessing cpp.defines. Before 527d5a8ec54e44291d4968754bdf574ebe57822b cpp.defines was not accessed for hpp files. Anyway it doesn't make sense to call moc in the aggregate as the generated files won't be compiled. Change-Id: I25ada3c8c54b199efb0877b59025fff88dc84dd8 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Retire Travis CIIvan Komissarov2020-11-234-104/+44
| | | | | | | Migrate Windows docker job to GitHub actions and remove .travis.yml Change-Id: I7f2ee5a6f27ded94a84550982c2c9fe404fe7475 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* doc: Add section about building Qbs with CMakeIvan Komissarov2020-11-231-0/+46
| | | | | | | | | Fixes: QBS-1618 Change-Id: Id70fdb4213fe7877978f4fa62bbb35dfe13adb51 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* 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>
View Lorry Controller Status