summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-06-05 10:30:49 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-06-05 08:33:21 +0000
commit38b7ee3533f553f1bacd1a80ce15a5e604f82721 (patch)
tree53fbdc09774524182e7546a151bc3fa6403a8fd7
parent35dc8f496dc324a816dc17e80b744bfe864ec261 (diff)
Revert "Map module.gui to if TARGET Qt::Gui in configure.cmake"
It breaks some conditions, and then the build fails not finding some private header files in qpa, etc. This reverts commit 35dc8f496dc324a816dc17e80b744bfe864ec261. Change-Id: I1b51eac06fe9186181d3f0a7c78f22da7be534e2 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
-rw-r--r--cmake/QtFeature.cmake8
-rwxr-xr-xutil/cmake/configurejson2cmake.py2
2 files changed, 0 insertions, 10 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake
index 33b1c7a955..c7e4764751 100644
--- a/cmake/QtFeature.cmake
+++ b/cmake/QtFeature.cmake
@@ -131,14 +131,6 @@ function(qt_evaluate_config_expression resultVar)
string(COMPARE EQUAL "${lhs}" "${rhs}" stringCompareResult)
list(APPEND result ${stringCompareResult})
- elseif("${member}" STREQUAL "TARGET" AND memberIdx LESS ${length})
- math(EXPR rhsIndex "${memberIdx}+1")
- list(GET exists_target ${rhsIndex} rhs)
- if(NOT TARGET "${exists_target}")
- set(result "target_does_not_exist")
- break()
- endif()
- set(skipNext ON)
else()
string(FIND "${member}" "QT_FEATURE_" idx)
if(idx EQUAL 0)
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 2de2567803..890d4dfc5f 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -281,8 +281,6 @@ def map_condition(condition):
elif match.group(1) == 'config':
substitution = map_platform(match.group(2))
- elif match.group(1) == 'module':
- substitution = 'TARGET {}'.format(map_qt_library(match.group(2)))
elif match.group(1) == 'arch':
if match.group(2) == 'i386':