aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog for the 1.18.2 releasev1.18.21.18Richard Weickelt2021-04-061-0/+41
| | | | | Change-Id: I950ec79e270e09407312fdad958f067f1db6b32c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* protobuf: fix setting includePath in nanopb.qbsIvan Komissarov2021-03-181-0/+2
| | | | | | | | This amends 0d42ca4d0f8b0866b51ac9587f68a6550ca6d3fe. Change-Id: I3650056431c51ae8d67575e217bfaebcf49b4f08 Reviewed-by: Kai Dohmen <psykai1993@googlemail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* protobuf: fix accessing undefined objectIvan Komissarov2021-03-152-26/+38
| | | | | | | | | | | | Always execute Probes to find files protobuf libs and headers even when the user passes path to those manually. This is required for the correct search of different library variants. This amends 87fdf5002. Change-Id: Ic7b9368b2b17925da33fd16299e31fd016043466 Reviewed-by: Kai Dohmen <psykai1993@googlemail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Bump version to 1.18.2Ivan Komissarov2021-03-091-1/+1
| | | | | Change-Id: I45dd78f2579555959742693d021613735d58c764 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* cmake build: Fix project files updates in Qbs binaryIvan Komissarov2021-03-022-1/+1
| | | | | | | | | | Session class is located in the binary itself, not in the corelib, so we need to pass this macro there as well. Do that by making this macro "public" as Qbs build does. Task-number: QTCREATORBUG-25232 Change-Id: I50b2f8a533db82cf28fd5d29c17fcfdc410c5ab2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* protobuf: fix _libraryName prop if protobuf is not foundIvan Komissarov2021-02-222-2/+6
| | | | | | Change-Id: Ia0cc1583ca95ce97b99c136433125cb90c59f3be Reviewed-by: Kai Dohmen <psykai1993@googlemail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GitHub actions: use empty qbs.installPrefix for release packagesv1.18.1Ivan Komissarov2021-02-171-1/+3
| | | | | | Change-Id: Ifddbebe4b3126d9f705df860622abd44bf5e5b7b Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* do not depend on QtGui in release buildsIvan Komissarov2021-02-151-1/+3
| | | | | Change-Id: I3be7b45e105fe2f605b4ffaf7ed059c62d790edb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qt6: fix handling qtmain in setup-qt.jsIvan Komissarov2021-02-121-0/+2
| | | | | Change-Id: I00fa1d5e3a2fdb24a84afe713c3ea2c4543f84bd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix static build with qmakeRichard Weickelt2021-02-091-4/+2
| | | | | | | | | | Building Qbs statically did not work since Qbs 1.17 because the application target did not correctly track the plugins as a dependency. The condition in qbs.pro was simply wrong. Fixes: QBS-1594 Change-Id: Id906423bd0d8d85b7a4f3342df4b9d39f60c4e36 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt/Android: Extend rule cycle prevention hackChristian Kandeler2021-01-264-6/+77
| | | | | | | | | | | After we did remove the hpp tag from the java-generated header, it was re-added by a file tagger in the cpp modules file, leading to an unexpected state on rebuilding. Fix this by replacing the tag, rather than removing it. Fixes: QBS-1628 Change-Id: I9d182cd30cf9a637733b84234e7a0b37f7583334 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* cmake build: Turn project file updates on by defaultEike Ziller2021-01-131-1/+1
| | | | | | | | | | Project file updates should be supported by any qbs binary, since nowadays IDE integration is not tied to a special build of Qbs. Task-number: QTCREATORBUG-25232 Change-Id: Ic2fe6b0ecdb77d84209ce16fdfe8158334a8bb29 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Xcode: Fix XCode auto-detectionIvan Komissarov2021-01-042-1/+55
| | | | | | | | If Xcode is moved to another location, we should use xcode-select -- print-path to find it rather than using hardcoded path. Change-Id: I9b5eba19c9e732e5e9da0322320fb0406249e020 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Bump version to 1.18.1Richard Weickelt2020-12-231-1/+1
| | | | | Change-Id: I151d9c3f1e42e42d72c031b523e3ab4c11c10ab1 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Add more paths to search in Library and Include probesJan Blackquill2020-12-232-1/+3
| | | | | | | | | These paths are used by containerisation systems such as Flatpak; searching in these by default makes building Qbs applications in Flatpak et. al easier Change-Id: I438ba1ffd66845ac1331791428135eb70105ff34 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 14:54:10 +0000