summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-06-04 17:34:27 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-06-05 08:13:42 +0000
commit35dc8f496dc324a816dc17e80b744bfe864ec261 (patch)
tree440e961ad57766b2e1deefd54ad02178f6bb7f69 /util
parentd0eb985f7413c62c2bff26caaf84bec2e6893131 (diff)
Map module.gui to if TARGET Qt::Gui in configure.cmake
Some features check for module existence. Adapt conversion script and QtBuild feature condition parser to handle that. Change-Id: I063e49a6fe9f8e9cf3aec985fd78ed4430398586 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'util')
-rwxr-xr-xutil/cmake/configurejson2cmake.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 890d4dfc5f..2de2567803 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -281,6 +281,8 @@ 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':