diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-06-22 16:00:03 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-06-23 22:12:41 +0200 |
commit | d6e01ae05c3695aaf7d0d434718154b6ff151e32 (patch) | |
tree | f741542f8a8e7f344bec831552fc16ea93c2b99d /dist/changes-3.2.0-b1 | |
parent | cc2fdce35e6a958e021b4d4cdc0ace1a91b06d0c (diff) |
Fix QT_HOST_DATA for builds setting INSTALL_MKSPECSDIR
In a Qt build that was configured with INSTALL_MKSPECSDIR set to
something different than INSTALL_DATADIR, the qmake property
QT_HOST_DATA was wrong. Consequently, mkspecs could not be loaded,
rendering qmake dysfunctional.
The reason was that we considered every QT_HOST_xxx property to have the
same value as QT_INSTALL_xxx in a non-cross build.
This is not true for QT_HOST_DATA, because users might want to set
INSTALL_DATADIR to "foo" but INSTALL_MKSPECSDIR to "bar/mkspecs".
Move the unused determination of the host data dir to the QtLibraryInfo
lib and handle QT_HOST_DATA specially.
Fixes: QTBUG-94591
Pick-to: 6.2
Change-Id: I2c44cda8405ff1d14391254fcd1d9b1361cb5855
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'dist/changes-3.2.0-b1')
0 files changed, 0 insertions, 0 deletions