diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-17 16:10:31 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-22 08:29:33 +0000 |
| commit | fecefdd36978cf2562f0f16f5f79debff7d07f79 (patch) | |
| tree | 161536547f5369d8a463f4398f6a8480592a35ba /src | |
| parent | 3212f1b8662b5e5483a0185c22820e2d14593aba (diff) | |
Fix mapping of features to private features
When a feature generates a private feature, we should not just repeat
the condition but also make it depend on the original feature. In qmake
features had different outputs, while we have a 1:1 mapping. For example
the developer_build feature had "private_tests" as an output feature.
There's no condition attached to the feature and auto-detect is off, so
we'd generate
qt_feature("developer_build" AUTODETECT OFF)
qt_feature("private_tests" AUTODETECT OFF)
and that's wrong, because when the user enables the visible feature
(developer_build) we want it to propagate to the private_tests feature.
Change-Id: Id8408864802fa1e1ed9e67a5f47d1d2fde38d321
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/configure.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index f674311ed2..8924d8da5d 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -655,8 +655,7 @@ qt_feature("opengl_dynamic" ) qt_feature("dynamicgl" PUBLIC LABEL "Dynamic OpenGL: dynamicgl" - AUTODETECT OFF - CONDITION WIN32 AND NOT WINRT + CONDITION QT_FEATURE_opengl_dynamic DISABLE INPUT_angle STREQUAL 'yes' OR INPUT_opengl STREQUAL 'no' OR INPUT_opengl STREQUAL 'desktop' ) qt_feature_definition("opengl_dynamic" "QT_OPENGL_DYNAMIC") |