| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: If381b6fab70732a6d980bd1334b709b49e7e2734
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
...to avoid fuss with possibly different Python versions found by CMake
and Qbs
Change-Id: I887f8aed8ed52b2766c0c1c411525b433b21458a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|
|
|
|
| |
Change-Id: Ifeecfa25af36d022529c10e1914cf0dd36e8c82c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|
|
|
|
| |
Change-Id: Ie9cfe4bd59ef8b692c522b4af97f9919624b37b7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|
|
|
|
|
|
| |
Amends b946dd352114e70bee5203ea02bb7be11f8ab998.
Change-Id: I89b4fd32b1087f542678aab34a208e6c5eee9c12
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|
|
|
|
| |
Change-Id: Ieb36a6ba96666f07cd1c22383964f8ecd5acdd33
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I5458b20c4105497b8f647a43299c3e727172577b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Amends c21932163779bcfe4577ac2e3326b8c113884829
Change-Id: I078df77ebfd7921c9c8bcaf131ae06a3a1fcd181
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
| |
It was never implemented
Fixes: QBS-1618
Change-Id: I702410b546cacd439989268d3d4fbb18051d1819
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I5c3a7898b61f8892a2de4414de64f40e5f9f537b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\
| |
| |
| | |
Change-Id: Ifcd65b201f060506d53dcffc0031d186a6dc227e
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
To be consistent with protobuf
Change-Id: Ib31956797f7b1ebcf37ab511dee502436900d899
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: Ic323ed03ecc3ab71ab69dc444183bb228c023c99
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
This amends 018194f4a
Change-Id: I2157d6697e6dfb30f72da624bb047c7650263aad
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ied6df640ea5262d75acc568bc1723ada086bb03f
Fixes: QBS-1599
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... 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>
|
|\|
| |
| |
| | |
Change-Id: Ibdf2afb9f05682e0624540af22330abc8580bafb
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We need to use the /Fa compiler option as described here:
* https://docs.microsoft.com/en-us/cpp/build/reference/fa-fa-listing-file?view=vs-2019
Change-Id: I81470bfbf84563a49bd5336e7204a07d5b2c910e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This 'none' value should be used for a bare-metal toolchains
in the qbs.targetPlatform and the qbs.targetOS properties.
Now this value is set in the profiles during automatic detection
of such toolchains as IAR, KEIL and SDCC.
Take into account, that it is impossible to do the same and for
the GCC toolchain, because there are not exists a proper way to
know that a current GCC is for a 'bare-metal'. So, the users
should change the qbs.targetPlatform manually.
Change-Id: I178fd526bbb5ae44f18e35ff12970ed0718c476d
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I20a6b02ee34719636f9996e02cff9e29cf160dd7
|
| |
| |
| |
| |
| |
| | |
Fixes: QBS-1304
Change-Id: Ie7d2c4827119dbdc6c807c56912431fb3111f712
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I968b45787cc5e410a6d58bfd092213118051e57a
Fixes: QBS-1318
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Fixes: QBS-1575
Change-Id: Ib0f5c4a28cbeca5993ae9490f2d5f34dd355f05b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QBS-1386
Change-Id: Ia432a0c78e1cccce586ed89f4235f41a55aef54c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Amends 0ac5a1467.
Change-Id: I4b4a636765a17e1808ca6573e504660525448386
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
|
|\|
| |
| |
| | |
Change-Id: Ice408bd77aa9f6481960c4fdf7f345a1a39b9f80
|
| |
| |
| |
| |
| |
| | |
Fixes: QBS-1350
Change-Id: I86cf583ea8cd54041c17a8656913702aab7fc35d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Cap'n Proto is a 'cerialization protocol' similar to protobuf:
https://capnproto.org/index.html
This patch mainly focuses on the c++ support for the capnp protocol
keeping in mind the possibility to add other languages later.
Change-Id: Ib19a9df1f45f2787503197791ac597d06cc45e9d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I013c19555af224e2f2ac39af37c63c8869109243
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QBS-1204
Change-Id: I2d04ccb0cbcd7c1a6b5a5f251e70d34b3a960da7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|/
|
|
|
|
|
|
| |
... to 5.14. We need >= 5.12 for a recent QRegularExpression patch, and
5.14 is also what Qt Creator is currently on.
Change-Id: I674e7b617acaed2bf2f668a31f82e800f05ccfc8
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
| |
For consistency with the cpp module
Change-Id: I16b9facc1c5befa6b8860dc1a51f8302ffac7a4d
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
This patch adds the Android.sdk packageType property which sets the target application.
By default (previous behavior) qbs generates an apk package. When set to aab, qbs generates
instead an aab package
Change-Id: Ic09776d08e2a2ecd68fb4c08881201a7a0a25240
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
aapt has been deprecated (https://developer.android.com/studio/command-line/aapt2) and replaced by aapt2.
PropertyOption aaptFileName allows those value: "aapt" and "aapt2".
Default value is set to "aapt" for the moment.
Fixes: QBS-1562
Change-Id: I1970cafaa54a0e035c08ffe5f9967b712f5c5253
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
This fixes qdoc warnings like that: "Could not resolve QML import
statement for type 'PathProbe'"
Change-Id: I839ddd2c702b1d56d2209c0eba4e3e44f2178364
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I2b03952f7c051243c70c512b3185ac1f2d73d4f7
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Module-definition (.def) file provide the linker with information about
exports, attributes, and other information about the program to be linked.
This file can be used instead of e.g. __declspec(dllexport) keywords
inside of a header files to export an appropriate symbols:
* https://docs.microsoft.com/en-us/cpp/build/reference/module-definition-dot-def-files?view=vs-2019
* https://docs.microsoft.com/en-us/cpp/build/reference/def-specify-module-definition-file?view=vs-2019
To make it supported, we have created the additional 'def' file tag,
and now we can add the required module-definition file to the
{Product|Group}'s 'files' property.
Fixes: QBS-571
Change-Id: I831d2e1b8f9f061a4414a5eaac85b71584f48c5d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: I9d302ce52b9fc280dff56c9f3fc51edf04ab5d1e
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: I454afa13b6b693f5818d207ab06927c9df1a0c01
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: I00b2063807943a32ff23f0bb26b642430036f973
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
This patch adds a new M32R architecture, provided by Renesas:
* https://www.renesas.com/eu/en/products/microcontrollers-microprocessors/m32r.html
Change-Id: I4f1550b00a2bd651c88c0b58fc250e3f65405406
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: Idbae1dcc9223bbc975c7139d1d3f994dc66a4ea4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I222a4de86bd131a21c28ed343cfc56348765ef0d
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I09ab919b7e4598e21a34f832219d4376e5ffb2d5
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|