| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
... the same way as Android.sdk.platform.
Change-Id: I974fdfd9f56f312cbd39ea155d87694622a9c0b8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
| |
This fixes this clang-tidy warning:
warning: avoid repeating the return type from the declaration; use a braced initializer list instead [modernize-return-braced-init-list]
Change-Id: I421e1e47462fe0e97788672684d47943af7df850
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Change-Id: I7419cc3fbc1e8776de3943852dcedab4c95d1c32
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: If09515d070802cc6d34101c5662962436482bd55
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
| |
... via the androiddeployqt tool.
Fixes: QBS-991
Change-Id: I4a3abe977fee6a9d1657a4fd6c1b43709429da9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Until now, we needed to either put the native part into its own product
or use multiplexing with the "APK product" serving as the aggregate. Now
it is also possible to use a single product without multiplexing, which
is a more natural approach in the case where there is only one
architecture.
Change-Id: I976168c99f75ad8e4940ac61f957c64ad29f5f5c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|\
| |
| |
| | |
Change-Id: I96c735aeda89e02f1fa9107ecfc10ebf4b554dbc
|
| |
| |
| |
| |
| | |
Change-Id: Iec49ba912161d5411a59440925dfd868a9c794fb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Revision 17 dropped some architectures, revision 18 removed GCC.
We also missed some earlier changes to clang-related paths.
Change-Id: Ie2fa1891f7f4de28e18ea6caadce9eac964bb523
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
These rules were unnecessarily complicated; in particular, the
indirection via a text file for the gdbserver and STL binaries was not
needed.
This also fixed the gdbserver file name in the package: It has to be
libgdbserver.so, rather than just gdbserver as on the host.
Change-Id: I2315660983904e8b922164be9054d6bba51f852d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
We now pull in the AIDL framework file and let the user set search paths
for imports.
Change-Id: I93460a77b064fa87849b93c0b0e4bd3bbfd7459f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The formerly required AndroidApk item is no longer needed: We just tag
the APK file as an application and let the Application item pull in the
Android.sdk module for Android targets.
It is also possible to have native code directly in the Application
product; in that case, the multiplexed variants become dynamic libraries
and the APK file is built for the aggregate.
[ChangeLog] The AndroidApk item was deprecated, a normal Application
item can be used instead.
Change-Id: I04f5f3892f354ca9eb4f2da8055abcd8d072aba0
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
There is no guarantee that we find it in the environment.
Change-Id: I58281b5936e0ddad51cbdbe0833f62c4dbb42c1d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
| |
We failed to account for the carriage returns in the jar output.
Change-Id: I2061a8ea306c64ce44039472f2840f71898c2097
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
| |
Change-Id: I68445c362386c6c310ab098ce5ea6780c1232e42
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Apparently, you cannot QFETCH const variables in Qt 5.6.
Problem introduced by drive-by change in 126ce8cd2b.
Change-Id: I6cbb9b5151748fb9d640cc705e0a85abfffd7c3e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
|
|
|
|
|
|
| |
This should help catch more errors in the future.
Change-Id: I54c1e4314357351af0df9fbb7ed6df36fda983f5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Instead, simply set the qbs.targetPlatform property for the relevant
products.
Change-Id: Ia39cf6d4f729783b0d7fb85a83023f438b9e3e20
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
...or raw iterators for reverse iterations.
Change-Id: I62a110ceeefaf70aaa41f6fb09d811f0eac05657
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
This is a simple find and replace with manual sanity check.
Change-Id: Iab6d46dcc3be246d1650aae2b1730f933b717be8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
This is a simple find and replace with manual sanity check.
Change-Id: Ia733befe7885dc3c643d5c84e151312bfd86a3c6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Make 'unexpected files encountered' only a warning instead of an error;
it's possible and has historical precedent in the Android samples.
Further, remove th ic_launcher.png files from the list of required files
of the teapot example. These became mipmaps instead of drawables at some
point and it is not worth the effort to try to create a proper
conditional to select the right list of files.
Change-Id: If71bc394e64c19448c152b905ecff29dd436d190
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Amends 8d0b530
Change-Id: Idcb3a05ab344914124d5eeb9811651b9ed9d1e83
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
Do not use magic numbers. Compare file lists.
Change-Id: Icb1e3b511ef43332335808ab53d94e12e116f647
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
We need to include qttools.h for qAsConst.
Change-Id: I1719be6f1a108dcea51ff25b4c5ec50c7203775f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
|
Android is not inherently tied to Java. Android apps can be built
without any Java at all (for example, using Kotlin and/or C++ instead of
Java).
This also paves the way to greatly expand the Android test suite as we
should be independently testing various pieces of functionality rather
than grouping everything into a single multi-axis test case.
Change-Id: I0b2950e701461320e7eb7266acccc78f5d98261f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|