diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-17 15:37:51 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-18 15:45:13 +0000 |
| commit | 9b8b1fe6d17d687697e3b4e6982fac959f7c8869 (patch) | |
| tree | 2ed6718d7d39400e2330f3ab63ce3c456600e321 /util | |
| parent | 5a081b5eedefe9b20f695541c31978ec205a10e8 (diff) | |
Fix the qmake error when building with qtquickcompiler for iOS
Fix condition when adding qmake_immediate to resources. This condition
was wrongly positive in any non-android case, but also had to check for
BUILD emptiness or build_pass. This cause issue because
qmake_qmake_immediate was added to the RESOURCES variable earlier, than
actually generated.
Fixes: QTBUG-88031
Change-Id: I38dad858a7e81ab709e622ec24baa8f9b80970fa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 58556afb6960b442f88649b550aaec8e1a04338b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'util')
0 files changed, 0 insertions, 0 deletions