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 35dc8f496d
.
Change-Id: I1b51eac06fe9186181d3f0a7c78f22da7be534e2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
parent
35dc8f496d
commit
38b7ee3533
@ -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)
|
||||
|
@ -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':
|
||||
|
Loading…
Reference in New Issue
Block a user