delta/qbs.git, branch v1.19.0 code.qt.io: qbs/qbs.git Fix reading Xcode 12.5 specs 2021-05-03T11:38:03+00:00 Ivan Komissarov abbapoh@gmail.com 2021-05-01T19:10:11+00:00 86eb6974126b4fdf4cfa3340b7a80833479f2d37 Since Xcode 12.5, common specs for darwin platforms were moved to "Darwin Package/Product Types.xcspec" in the different folder. However, the old configs are still present, so we need to merge info from both variants. Also, allow to use undefined variables in .xcspec files - since 12.5, this is a valid use-case. Also, implement the "default=" variable formatter used as a fallback when variable is not set. Fixes: QBS-1644 Change-Id: I9a55c5d511cbb01f30219478ee9f3b85763a08d5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> 
Since Xcode 12.5, common specs for darwin platforms were moved to
"Darwin Package/Product Types.xcspec" in the different folder. However,
the old configs are still present, so we need to merge info from both
variants.
Also, allow to use undefined variables in .xcspec files - since 12.5,
this is a valid use-case.
Also, implement the "default=" variable formatter used as a fallback
when variable is not set.

Fixes: QBS-1644
Change-Id: I9a55c5d511cbb01f30219478ee9f3b85763a08d5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Fix compiler warning on MSVC64 2021-04-28T16:50:46+00:00 Orgad Shaneh orgad.shaneh@audiocodes.com 2021-04-28T04:54:48+00:00 7111630416211363b8cc56f179bfa7ba4f271817 C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data Change-Id: I8bc3f90bc27f7142f6095123e30b956f07b1b618 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> 
C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data

Change-Id: I8bc3f90bc27f7142f6095123e30b956f07b1b618
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
codesign: skip test for mingw toolchain 2021-04-27T07:58:46+00:00 Ivan Komissarov abbapoh@gmail.com 2021-04-26T11:29:01+00:00 1e092969ae070e3a967dd86ed06fd8531f94cd6f Also, skipt the test for MSVC when certificate was not found. Change-Id: I27103f9cab4793947eb3f5b1afd0bac557fe68ac Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> 
Also, skipt the test for MSVC when certificate was not found.

Change-Id: I27103f9cab4793947eb3f5b1afd0bac557fe68ac
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
codesign: do not use signtool for mingw toolchain 2021-04-26T09:46:17+00:00 Ivan Komissarov abbapoh@gmail.com 2021-04-26T08:43:44+00:00 adf00fb1a0faed60b045dced0773761b5cf89251 Change-Id: Ic6d3df6210c1af174e6caa8ba46e365e42f79273 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> 
Change-Id: Ic6d3df6210c1af174e6caa8ba46e365e42f79273
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
codesign: Long live `signtool` signing on Windows 2021-04-23T14:55:38+00:00 Denis Shienkov denis.shienkov@gmail.com 2021-03-29T15:15:17+00:00 2f6eecdc96fcd693cecef8011d8f9500c7872fc7 Change-Id: I320cd1a1f3d8a1eed11d1c70007214f19a109b6e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> 
Change-Id: I320cd1a1f3d8a1eed11d1c70007214f19a109b6e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
msvc: Pass -vcvars_ver to vcvarsall.bat when detecting environment 2021-04-23T13:11:38+00:00 Ivan Komissarov abbapoh@gmail.com 2021-04-20T19:25:49+00:00 2f34e637828f7e519a25a498bd5aa4e8f955217d This is required to properly support multiple MSVC toolchains (also now supported). Fixes: QBS-1498 Change-Id: I1274379496d47ebf7842eaed05f498b7af111b5b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> 
This is required to properly support multiple MSVC toolchains (also now
supported).

Fixes: QBS-1498
Change-Id: I1274379496d47ebf7842eaed05f498b7af111b5b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Merge branch '1.18' into 1.19 2021-04-21T22:51:57+00:00 Ivan Komissarov abbapoh@gmail.com 2021-04-21T22:51:57+00:00 9ab9f972fc2ee1642b73c8abb2aafe6a87e287df Change-Id: I998d74e10ad9082f7d76af354135b2b4602d9d1a 
Change-Id: I998d74e10ad9082f7d76af354135b2b4602d9d1a
Use binary search in Set::find() 2021-04-21T15:32:06+00:00 Ivan Komissarov abbapoh@gmail.com 2021-04-21T12:03:58+00:00 d54d84a213041f9b84bc3061019f1d089ab74019 Change-Id: I5ed154633233dfeedf6b69b52fc5339fef3a956a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> 
Change-Id: I5ed154633233dfeedf6b69b52fc5339fef3a956a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Android: Compensate Qt issue in network dependencies for 5.15.0 < Qt < 5.15.3 2021-04-20T21:13:15+00:00 Raphael Cotty raphael.cotty@gmail.com 2021-04-18T22:10:14+00:00 18c97249f38af5492739f9215d702b918ad9132a Because of QTBUG-87288 the Qt5Network_ARCH-android-dependencies.xml is not properly generated. The bug is only corrected in Qt 5.13. This patch automatically updates the android manifest for version prior to 5.15.3. Change-Id: I0e7ea7f316f8af2d6c7b05340d9db3a72ba0110c Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> 
Because of QTBUG-87288 the Qt5Network_ARCH-android-dependencies.xml is not properly
generated. The bug is only corrected in Qt 5.13. This patch automatically updates
the android manifest for version prior to 5.15.3.

Change-Id: I0e7ea7f316f8af2d6c7b05340d9db3a72ba0110c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Fix build with older compilers 2021-04-20T10:51:15+00:00 Ivan Komissarov abbapoh@gmail.com 2021-04-19T15:37:14+00:00 33634338b925490d1ee713d30670e5c3f96e9139 This amends d38fd9fa9. Change-Id: I55661497de04749dfd27134ef7c8c9cc436053e2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> 
This amends d38fd9fa9.

Change-Id: I55661497de04749dfd27134ef7c8c9cc436053e2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>