diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-06-05 12:42:14 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-06-05 13:02:22 +0200 |
commit | 99636127d10f96d8313bc26030cabf9841381914 (patch) | |
tree | 80299bf3749450f493cc4e7952bfd73b6e280e51 /qmake/generators | |
parent | d212c179db318a20d74592b02dd57b9bb1b668ce (diff) |
Fix prefix_build check for top-level builds
The checks whether we have a Qt prefix build were broken for
top-level builds. Non-prefix top-level builds were incorrectly
detected as prefix builds.
For top-level non-prefix builds QT_HOST_DATA/QT_INSTALL_PREFIX becomes
something like "~/my/build/dir/qtbase" but .qmake.cache (and
.qmake.super) is/are created in "~/my/build/dir".
This patch extends the prefix_build check by probing for the existence
of .qmake.super, which only exists for top-level builds. Also, we add
qt_prefix_build_check.prf as central place for determining whether we
have a prefix build to make sure that qt_configure.prf and
qt_build_config.prf use the same logic.
Fixes: QTBUG-76185
Change-Id: I2b76fe26013496aaf2dac96ea711b06a69550a29
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'qmake/generators')
0 files changed, 0 insertions, 0 deletions