aboutsummaryrefslogtreecommitdiffstats
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* 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 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>
* Fix that target was accessed before it was createdEike Ziller2020-12-041-0/+1
| | | | | | | 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-032-2/+10
| | | | | | | | | | | 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-031-14/+9
| | | | | | | | 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-261-0/+5
| | | | | | | | | | | 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>
* Android: Update sdk/ndk/tools versionsRaphaël Cotty2020-11-181-1/+1
| | | | | | | | | 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-174-7/+45
| | | | | | | | | | 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>
* Implement missing check for allowed values in PropertyOptionsIvan Komissarov2020-10-281-2/+0
| | | | | | | | | | | | | | ========== 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>
* Merge branch '1.17'Ivan Komissarov2020-10-264-7/+34
|\ | | | | | | Change-Id: Ifcd65b201f060506d53dcffc0031d186a6dc227e
| * Xcode: fix compilation for ios-simulator with Xcode 12v1.17.11.17Ivan Komissarov2020-10-261-0/+8
| | | | | | | | | | | | | | | | 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>
| * Android: Remove targetName suffix from QtApplicationRaphaël Cotty2020-10-233-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | 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: Update for Qt 5.15Raphaël Cotty2020-10-212-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | 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-211-2/+10
| | | | | | | | | | | | | | | | | | | | | | 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>
* | capnp: Make outputDir variable publicIvan Komissarov2020-10-263-3/+3
| | | | | | | | | | | | | | To be consistent with protobuf Change-Id: Ib31956797f7b1ebcf37ab511dee502436900d899 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | 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>
* | cmake: Fix issues with configuring locations on WindowsEike Ziller2020-10-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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-081-21/+16
| | | | | | | | | | | | | | | | 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-082-2/+9
| | | | | | | | | | | | | | 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>
* | 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>
* | Make protobuf.*.outputDir public againKai Dohmen2020-09-245-20/+24
| | | | | | | | | | | | | | | | | | | | 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: Implement cpp.generateCompilerListingFiles for ARMCLANGDenis Shienkov2020-09-232-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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-171-2/+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>
* | Add protobuf.nanopb moduleKai Dohmen2020-09-163-29/+86
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Remove extra semicolonsDenis Shienkov2020-09-118-32/+32
| | | | | | | | | | Change-Id: If2c25fb03a9c6429a4af66efcd703e4fefe65820 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Fix InnoSetupModule to support InnoSetup v6Ivan Komissarov2020-09-043-11/+23
| | | | | | | | | | | | | | | | Also, fix tests to check the presence of the innosetup in qbs files instead of the test itself Change-Id: I5fcb40cf301cf606c2cf3414a716ed66d1083868 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | baremetal: Fix assignment of probes 'found' flagDenis Shienkov2020-09-046-23/+16
| | | | | | | | | | | | Change-Id: I532e06f6688c5ad32702cd3401ae4ef37200a23f Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix accessing toolchainInstallPath variable in NSIS moduleIvan Komissarov2020-08-311-1/+1
| | | | | | | | | | Change-Id: Ib1892aed09efaa998084af0e8e805783fc39d971 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Extract compiler macros using common JS functionDenis Shienkov2020-08-315-32/+16
| | | | | | | | | | | | | | | | It makes sense to unify the compiler macros extraction using a common JS function, instead of a JS code duplication. Change-Id: I9eb9e8df012ca6bae3a38101906a4c70e2fc38c4 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Introduce an "exportingProduct" variableChristian Kandeler2020-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... for use in Export items. It's not obvious that "product" refers to the exporting product, and in fact setting it up this way pollutes the scope for modules loaded via Export items. Therefore, we introduce exportingProduct for symmetry with importingProduct. [ChangeLog] Deprecate the product variable inside Export items in favor of the new exportingProduct variable. Task-number: QBS-1576 Change-Id: Ie91752d1ae2160cb7701ae0167bccde0cd5c0e5d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* | Merge branch '1.17' into masterIvan Komissarov2020-08-171-1/+1
|\| | | | | | | Change-Id: I733267955eb847f0de6148da3e2c210b2c9103e7
| * Fix passing compiler defines to mocIvan Komissarov2020-08-171-1/+1
| | | | | | | | | | | | | | | | | | This fixes the issue that Qbs doesn't pass the compiler defines to moc when processing header files which resulted to Q_OS_* being not defined. Fixes: QBS-1592 Change-Id: I58a0cc9af5cfa2fb4a370bb0d7204a3b100da437 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Initial CMake portIvan Komissarov2020-08-171-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows to build Qbs using CMake build tool Tested platforms - Linux (gcc) - macOS (clang) - Windows (msvc2017) Missing features (compared to Qbs build) - Documentation build - Bundled QtScript support - Static build - .pc file for qbscore - qbs module for qbscore Change-Id: I09b5dadd6723d5a47e5ef2a9a38d3300488718f2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge branch 1.17 into masterRichard Weickelt2020-08-1413-50/+115
|\| | | | | | | Change-Id: Ibdf2afb9f05682e0624540af22330abc8580bafb
| * Replace wrong continue statement with returnRichard Weickelt2020-08-141-1/+1
| | | | | | | | | | Change-Id: Ia764530de200b80acf833e0e9ffc751b1988756c Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * Tune search order of path probesIvan Komissarov2020-08-131-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Within the groups of user-provided and system-provided paths, environment variables need to take precedence over properties, because there is currently no other way to override the search paths of probes from the outside if the probe-using code did not explicitly bind them to Product/Module properties. We search directly user-provided paths before ones from system-provided environment variables to minimize the risk of surprises due to outside influence. [ChangeLog][Behavior Changes] The lookup order in PathProbe changed to [environmentPaths, searchPaths, platformEnvironmentPaths, platformSearchPaths] Change-Id: Ib0c3bc44e5a8efaaaa073f28f1f3a53feb0f78db Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * baremetal: Fix detection of ARM architecture details for KEIL armclangDenis Shienkov2020-08-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The '__ARM_ARCH_PROFILE' macro contains the desired ARM profile letter, which appends to the resulting ARM architecture name. But a problem is that this letter wrapped in quotes, e.g. 'M'. In this case the constructed architecture also has this quotes, e.g. armv6'm', that's wrong. We need to remove all quotes from the found letter and then append this letter to the resulting string. Change-Id: Idea61082ebb584151ddcb1acc9eba62a516ea170 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 23:06:55 +0000