delta/qbs.git, branch v1.22.1 code.qt.io: qbs/qbs.git Fix install of QCH and HTML documentation 2022-04-20T09:47:47+00:00 Dmitry Shachnev mitya57@gmail.com 2022-04-02T17:20:35+00:00 b6a46aa0199c2595766495673f67a8190f3342fe - 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> 
- 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>
Update changelog 2022-04-08T10:01:50+00:00 Christian Kandeler christian.kandeler@qt.io 2022-04-08T10:01:28+00:00 0ccbc9f30d3fc6994d6ec3a7db0ed60e2c9dc500 Change-Id: Ic571216e459246f98789b21de40e7d25f132fba0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> 
Change-Id: Ic571216e459246f98789b21de40e7d25f132fba0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Merge "Merge remote-tracking branch 'origin/1.21' into 1.22" into 1.22 2022-04-08T07:52:17+00:00 The Qt Project gerrit-noreply@qt-project.org 2022-04-08T07:52:17+00:00 dfc69dbea50560a5fa9388c99cbeceeb37c676b1 






Documentation: Adapt to introduction of "exportingProduct"
2022-04-07T11:46:19+00:00

Christian Kandeler
christian.kandeler@qt.io

2022-04-05T09:14:29+00:00

6e4b5560b1eb3835d247eef828f90da78692150a

Amends 7f424ec158.

Fixes: QBS-1694
Change-Id: I0cc6d1a022c863ce38e0dd0e3f00ba7929c73041
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>





Amends 7f424ec158.

Fixes: QBS-1694
Change-Id: I0cc6d1a022c863ce38e0dd0e3f00ba7929c73041
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>







Merge remote-tracking branch 'origin/1.21' into 1.22
2022-04-07T08:45:31+00:00

Christian Kandeler
christian.kandeler@qt.io

2022-04-07T08:43:52+00:00

6ce70663712a36bfc95c9e8c0f4ebd14102ff327

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





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







Fix build for android when the project has file named "version"
2022-04-06T07:05:07+00:00

Dmitrii Kolpakov
kolpakov@rutoken.ru

2022-04-04T11:29:35+00:00

2d85e7fd52a2897d43fd351eb202d5bd8213490e

The assembly for android breaks when there is a "version" file in the
root folder of the project.

Fixes: QBS-1691
Change-Id: Ie86d23618dff5fa0e28cbf3b756133df5751160f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>





The assembly for android breaks when there is a "version" file in the
root folder of the project.

Fixes: QBS-1691
Change-Id: Ie86d23618dff5fa0e28cbf3b756133df5751160f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>







Add changelog for 1.22.1
2022-04-04T08:55:02+00:00

Christian Kandeler
christian.kandeler@qt.io

2022-04-01T11:15:42+00:00

66c67898456c4f599e48d5466022d49b044f679d

Change-Id: Ided671e2255315dba2bdbc0491eed3689cd36d53
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>





Change-Id: Ided671e2255315dba2bdbc0491eed3689cd36d53
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>







Fix Xcode support for 13.3
2022-04-04T08:54:17+00:00

Christian Kandeler
christian.kandeler@qt.io

2022-03-30T10:10:38+00:00

d64c7802fef2872aa6a78c06648a0aed45250955

Some .xcspec files got new names and/or locations.
Also, we now fully expand the values of property list variables before
applying formatters. Presumably this used to work by accident because a
simple look-up never produced a value in need of expansion.

Fixes: QBS-1693
Change-Id: Ie66ec69042cdceede9d5ddec7c17de1c3c25a167
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>





Some .xcspec files got new names and/or locations.
Also, we now fully expand the values of property list variables before
applying formatters. Presumably this used to work by accident because a
simple look-up never produced a value in need of expansion.

Fixes: QBS-1693
Change-Id: Ie66ec69042cdceede9d5ddec7c17de1c3c25a167
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>







Bump version
2022-03-31T11:58:04+00:00

Christian Kandeler
christian.kandeler@qt.io

2022-03-28T13:57:58+00:00

77ce522281f33a6d06e7cd9fde39e9f578134533

Change-Id: Iecc83aa9f30486068f01db16e35aaff890faa225
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>





Change-Id: Iecc83aa9f30486068f01db16e35aaff890faa225
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>







Qt support: Fix wrong lib file path deduction for "external" modules
2022-03-30T11:20:45+00:00

Christian Kandeler
christian.kandeler@qt.io

2022-03-28T14:33:49+00:00

7259f0db9ca51947630abfc2f813d16e9f4a8945

The list of libraries can contain names (e.g. "m" or "z") rather than
file paths, in which case we must not use it to guess the module's
library file.
Amends c82daaac43.

Change-Id: I10fd6e1fcc8268adbc595345af80955be0dba5ec
Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>





The list of libraries can contain names (e.g. "m" or "z") rather than
file paths, in which case we must not use it to guess the module's
library file.
Amends c82daaac43.

Change-Id: I10fd6e1fcc8268adbc595345af80955be0dba5ec
Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>