| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I48238045173213a48f64ec4f047fd3a9d3ad63ea
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
| |
Change-Id: I76cbafa8c0eaf8c6d48c6d1a4c2cd4ba8c9215c6
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
| |
Change-Id: Ib747e824dd56b0fb0debbbecf37a3a61cac367ec
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
| |
See qtbase/0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e.
Change-Id: I2ec73eb699a8f3a4cca9bb9091534b51bb578ae6
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
| |
Change-Id: I2d64beeb48370cd51c87c7dff835451f89ae04c4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
This amends 54ec5e8851f0573beb466ddec2e20a1f3c2b7f7a.
Change-Id: Ie2b5d7fa18b2df1776e8c33ab84c6e3c72322a2a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Required for MacPorts.
Change-Id: I0ed3e6ddb0414669fccc8102e228631040b1fbb7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The HTML documentation was not installed if QCH doc was not
requested, fix that.
Introduce a new 'qbs_docs' target which should be used instead
of the 'BuildQbsDocumentation' target. This is done for
compatibility with QMake.
Also, introduce a single 'qbs_docs' component for installing docs
in one go - this is required for MacPorts since there is no easy way
to install multiple components at once with CMake.
Which docs will be installed is controlled at the configure step:
$ cmake -DQBS_INSTALL_HTML_DOCS=1 -DQBS_INSTALL_QCH_DOCS=1 -DQBS_INSTALL_MAN_PAGE=1
$ cmake --build . --target qbs_docs # not required for man-page only install
$ cmake --install . --component qbs_docs
Change-Id: I174662c54255a8fb10529b1961c298eb1f1b1470
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I3ced9fc96742bd3acf246bea9e400a938180f71e
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
| |
Change-Id: Ibce74cf1b524c8c08b38dfc76549b4723ea705b3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Ic0a05c8d97e77f441e6efdd1216715d2479cdb10
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Variables should be allowed to be set to empty values,
only missing variables should produce errors.
Fixes: QBS-1702
Change-Id: Ib9aac611a578a3673fb8201099a707e5842fd750
Reviewed-by: Kai Dohmen <psykai1993@googlemail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Those toolchains expect separate parameters for linker script flag
and script itself.
This amends ff04acd64d85d460e0f52a7ead233ae503e616d7.
Fixes: QBS-1704
Change-Id: Icd7028be89457ea539b5edae9c572bffdad6d997
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
| |
Fixes: QBS-1703
Change-Id: Idb33b9e2336c5b7fb7df37472fb6728ff06dd751
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Idf4652963cca9e32bc086ea67fd7d4af6461ba17
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
The 'host_bins' variable was renamed to 'bindir'.
Change-Id: Iab235ea7c5ba93d7c815470e432b293f7a06ab37
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I6ebb9976cd003e9d1a6bbf0a16730088c4c4fb8c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
Cpp module should have its own section.
This amends 825d344f0676fbc3ffe17f30b30768f303ee62e2
and 123256af285883c2c2b21bae5575e18fb8f71beb.
Change-Id: I12ff8a7d7a06093856b3c7ddc60ab60f8bb63a65
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
It is supported since MSVC 16.8[1] and clang-cl 13[2].
[1] https://devblogs.microsoft.com/cppblog/c11-and-c17-standard-support-arriving-in-msvc/
[2] https://github.com/llvm/llvm-project/commit/d087d805acb664e885e9c31a916f6cfa5dbc2186
Change-Id: I858beadf20c357d8a4c369ab7bc32f69ef956ebb
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
Compiler version sources:
https://en.wikipedia.org/wiki/C17_(C_standard_revision)
https://en.wikipedia.org/wiki/C2x
https://en.wikipedia.org/wiki/Xcode#Xcode_11.0_-_14.x_(since_SwiftUI_framework)
Change-Id: I3bdb54334e0cbf326a5d25d31c45f331cbb36c55
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
We ended up dereferencing then end() iterator in many cases.
Not that is a problem, but MSVC strict iterators crash in debug.
Change-Id: Ie7cf1fd4a37cc37d568943a5bab57ac699f19265
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I9ff9aac9d332b28af6af2cb9a5d74aaf69de34c2
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
| |
It's in the libexec dir as of Qt 6.3.
Change-Id: Id6e86b41ee956732d81aa18d3b44ccb436c38c0b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
| |
Change-Id: Ic4cf09546be09d6bc5f825cbf0720cd1854b428b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
Also, remove XCode 10.3 because macos-10.15 runner
is deprecated.
Cherry-picked f169b258e95e329d81c42ddfd65b084fd97e47ef.
Change-Id: I680c996ae1de63ad9d75cdb15c185f7ac3d5e275
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
The condition should not affect ios
This amends 59e983d5d998d62930e590264ff70314b84f3a90.
Change-Id: I6c1912d43d455188476976712be0a6b4989e128a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
This partially reverts 363e32d41c297355c9766c34ac6b61bfbc668b6a.
Change-Id: I2fb58b0505e76b9bc46da6af8ba195e8c821a723
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Otherwise, proto files are not linked with
the missing reference to ~InternalMetadata().
Similar issue is here https://github.com/google/oss-fuzz/issues/7736.
Change-Id: I4ad04fbcb2c49f2ab435ca560de623fae97754b4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Iec06eaf35b4ee23edb9f744b80b57db5115f3b4c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
The exactVersion and maxVersion docs were somewhat mixed up.
Change-Id: I840fb09e72ab53251edd1c2af038f080eb27905a
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
| |
- prl files can refer to QT_INSTALL_PLUGINS
- object files can appear in QMAKE_PRL_LIBS
Change-Id: I2ab707ab3677a1e7be71c93f211677b5df04b23f
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
-Wconstant-logical-operand is clang-only.
Change-Id: I8dbba65b503b865ac331ce555b941f9dc1929e3a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
|
|
|
|
| |
Change-Id: Id9bc1397e6befee56ee26cef8085bda53d7cdc0c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The modern way to install android packages is to use cmdline-tools. The
old way was to use SDK tools, but now it is deprecated (see
https://developer.android.com/studio/releases/sdk-tools). There is a code
in AndroidSdkProbe which looks for android executable in SDK tools folder
to prove, that the folder does contain Android SDK. But if you use
cmdline-tools, there is no folder "tools" anymore. The probe fails to find
build tools. The fix is to look for build-tools directory.
Fixes: QBS-1700
Change-Id: Iad92664ba07d034ba365e8b7b178cd47f5d3f187
Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
The java.jar artifacts declared in the product were ignored during dex
compilation. The function were looking only for jars in the dependencies.
Fixes: QBS-1701
Change-Id: I4d7b355236fc988f44161aaa22d87a16a7e94fb6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
This is required for user applications as of
qtbase/0dc6cc055174a0556f2e41ca269013b3a7056c86.
Also update our own build system files accordingly.
Change-Id: Ibc640555cdf0cae6e0c5353b2f5d99af4475b510
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
|\
| |
| |
| | |
Change-Id: I8438df69b247b30b98a7045adc04e4d43105fa38
|
| |
| |
| |
| |
| | |
Change-Id: Ifdaed0906a4619a8f681fd900f0939cf26b0f059
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
JavaScriptCore\runtime\RegExp.cpp(214): warning C4018: '>': signed/unsigned mismatch
Change-Id: Ie4b4f8d31065c293b9d752a6c14747bab3556309
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Because of this bug, 1.22.0 was correctly replaced with 1.22, but
1.22.1 was wrongly left as is.
Change-Id: Iadadb543fa57c4f897bbff3109cfc3216e92b8ae
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I36fc5c61dafe4f5fc87db53d863cc97743440deb
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- qbs.qch should go to QT_INSTALL_DOCS, not to QBS_DOC_INSTALL_DIR
(which ends with /html by default).
- HTML documentation was not installed at all.
Change-Id: I11fa33e5d2f9e0a39184a7d82ac1a8faf064f25e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\ \ |
|
| |\ \
| | |/
| | |
| | | |
Change-Id: I9d36b1bacae3c0f449c67d985fea626e798e4f8b
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic571216e459246f98789b21de40e7d25f132fba0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| | |\ |
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It seems we completely forgot to merge 1.21 into master, losing at least
some of the bugfixes in 1.21.1.
Change-Id: I4e8e32a861da817d9b686991933d6a32332534c5
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: Ie696856c3ffc13636cb09e4deec2a35c68aec041
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
'ErrorItem::toJson()' maps the key 'description' to the textual description
of the error.
Change-Id: I92c4b7521f6ffbda60196eb1fa363a0a79431f6a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Amends 1e518097fa.
Change-Id: Id9c22085ec0f2e3f771e8df453fc9dbb79720d5c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|