diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-12-16 13:27:20 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-12-16 19:17:47 +0100 |
| commit | 57abfedf8bc2e742dbf859d479b0b4619249b04e (patch) | |
| tree | 845fe5e347459ae2e0f430bcfdc1c2b71d608efe /configure.pri | |
| parent | 542d14bd02df770198f962b9d879aef94aa8dd32 (diff) | |
configure: Hacky fix to allow re-configuring on android
Make sure that when we call $$qtConfEvaluate("features.shared")
early, the result is not cached via the available key, so that
the value is properly re-evaluated further on when all features
are processed.
Fixes the error message when reconfiguring an Android build
"Unknown feature object shared in expression '!features.shared'."
Amends 4ac872639ed0dd3ae6627e05bdda821f7d128500
Task-number: QTBUG-79639
Task-number: QTBUG-80096
Change-Id: Ic1cbadac15c34468a9115cc8ec5ea07630185772
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 8a65b727e5..81c84b28ef 100644 --- a/configure.pri +++ b/configure.pri @@ -823,6 +823,8 @@ defineTest(qtConfOutput_preparePaths) { libloc_absolute_path = $$absolute_path($$config.rel_input.libdir, $$config.input.prefix) } config.input.liblocation_to_prefix = $$relative_path($$config.input.prefix, $$libloc_absolute_path) + config.qtbase.features.shared.available = + export(config.qtbase.features.shared.available) hostbindir_absolute_path = $$absolute_path($$config.rel_input.hostbindir, $$config.input.hostprefix) config.input.hostbindir_to_hostprefix = $$relative_path($$config.input.hostprefix, $$hostbindir_absolute_path) |