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

Some features check for module / target existence. Adapt conversion
script to handle that.

Reland after fixing it.

Change-Id: If4fb942c2e0d16e76a0b9b767bf478527851b0f7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

cmake/QtFeature.cmake

@@ -142,6 +142,8 @@ function(qt_evaluate_config_expression resultVar)
             list(APPEND result ${member})
         endif()
     endforeach()
+    # The 'TARGET Gui' case is handled by qt_evaluate_to_boolean, by passing those tokens verbatim
+    # to if().
 
     if("${result}" STREQUAL "")
         set(result ON)

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':