1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Map module.gui to if TARGET Qt::Gui in configure.cmake"

Browse Source 
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>
This commit is contained in:
Alexandru Croitor 2019-06-05 10:30:49 +02:00
parent 35dc8f496d
commit 38b7ee3533
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtFeature.cmake
View File

@ -131,14 +131,6 @@ function(qt_evaluate_config_expression resultVar)
string(COMPARE EQUAL "${lhs}" "${rhs}" stringCompareResult) string(COMPARE EQUAL "${lhs}" "${rhs}" stringCompareResult)
list(APPEND result ${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() else()
string(FIND "${member}" "QT_FEATURE_" idx) string(FIND "${member}" "QT_FEATURE_" idx)
if(idx EQUAL 0) if(idx EQUAL 0)

2
util/cmake/configurejson2cmake.py
View File

@ -281,8 +281,6 @@ def map_condition(condition):
elif match.group(1) == 'config': elif match.group(1) == 'config':
substitution = map_platform(match.group(2)) 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': elif match.group(1) == 'arch':
if match.group(2) == 'i386': if match.group(2) == 'i386':