| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
========== 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>
|
|
|
|
|
|
|
| |
Should save some allocations. Requires making ctors public.
Change-Id: I9d8a14a1c2edf374add0fdae914a028f9987d216
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
We print them in the "Setup Qbs" step
Change-Id: Ib523770b9d93882fdab64a7a74a807abbd2cd248
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I818164b62bd75579771a5caf3a74be796e253c54
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I0db7d7104cd06521291970a51ddf0a6f55cc71a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Add also a job for github actions.
Change-Id: Ibf4b1740379605f32ead66657bc4b81529089cc9
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
| |
Should be "profiling", not "profile"
Change-Id: I79f1607a4a1880a67bb49b08dfabbe0a5715aaa7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\
| |
| |
| | |
Change-Id: Ifcd65b201f060506d53dcffc0031d186a6dc227e
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: Ie4584b39080db3e2d2b87ca0fa1b73a6f807ef97
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Amends 2f5f049e.
Change-Id: Ifa77899b3f5b206c1436f6ad6baea4c4d7a238ed
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: I42518663555a503e2bc3dea9b33fc604cbee51e2
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: I404ac10a14517763daf656dd38dd560534cbf1fa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I9220b1e6344e90401abf4fb91115e77a3a6c996f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
To be consistent with protobuf
Change-Id: Ib31956797f7b1ebcf37ab511dee502436900d899
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ia38f08fb32b50761e7fb8642019aad39a25c1ef2
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This will fix Qt Creator's build on GitHub Actions which fails
on Windows bots at install time due to the symlinked directory.
Change-Id: I765a65cf4e85650403600ac77c3f54633ac4eb02
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Setting the compiler/linker prefix globally heavily interferes with
other setups. For example it breaks compiling resources with rc.exe on
Windows. Use CMAKE_C_COMPILER_LAUNCHER=ccache and
CMAKE_CXX_COMPILER_LAUNCHER=ccache when calling cmake instead.
Change-Id: Id7fa7a3ce8b19b658eee0b661c9dfa060c3d62c9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: Iec454ad0a850652cb6bd40257c287f13120baca0
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: I239eb88f52eef6c6733f02a9d3b372999a9195de
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ibe8ce04ce1d036f6b1bb167855d493e6fb3e52a4
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Leave only macos (since github is broken) and windows docker (which is
not ported to github)
Change-Id: Ibcc5805e80c5aacf5be152fb3fab20060a09db77
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Fixes: QBS-1601
Change-Id: Iead18bf5fd25f965cf9f9748469f2469488eabc8
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| | |
Change-Id: Ia8ac795b55ba18fd6d855a1f880c5e3caa66b742
|
| |
| |
| |
| |
| |
| |
| | |
Fixes also the broken link in the nuspec file.
Change-Id: I0da24c19eb388a8377772fa3f1115a6afba31777
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I13bb24c875a2a2fb3503ea5344171267b74bf706
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We need to add the cpp.assemblerFlags property, because now
the cpp.driverFlags property does not passed to the assembler.
Change-Id: I9d7429126e4d99284fbe3307a4950904913af3d6
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I66810811b04d1fb7909ee0bb9975d1823ce6e9b6
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: I78ba146f349018f77285e0fd5957fc49bfc03794
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: I09d3d3edbcdb3d1e5ae82fce4d204a174dfda5bb
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: Ic323ed03ecc3ab71ab69dc444183bb228c023c99
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: If8a75095f98bf38f9cbd178d8ed857dfcb368833
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| | |
Change-Id: I2efcdf5009d0011ceb11e37451305c36f0f87475
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit adds example for both PCA10001 and PCA10024
development boards (based on nRF51822 MCU) from Nordic
Semiconductor.
This example only blinks with the green LED and supports
both GCC and KEIL toolchains.
Change-Id: I5b77cfc45fee4b8d52d9cc1647f689b5e737c132
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ib3bba4468bdf8851e61f48eecea597ae552c7647
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ic9c812e2891426906fb4c911f03c5f5e0305159d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I57bfbd5e6865527187661fb2fae8c47d49349dfc
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This reduces execution time to 1s (was 10s) and simplifies PathProbe
debugging because the cpp module contains probes as well.
Change-Id: Iddd4de71143892d6815acbd1efff30f92d70a423
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|