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

Handle minimal_syncqt as not running syncqt for now

Browse Source 
This is needed for QmlDevTools in qtdeclarative.

Change-Id: I41adec15f292c91192e171b45d1e5d48764c37c4
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2019-06-07 10:51:55 +02:00
parent aa956e0822
commit 38b1474c51
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtBuild.cmake
View File

@ -1061,7 +1061,7 @@ function(add_qt_module target)
# Process arguments: # Process arguments:
qt_parse_all_arguments(arg "add_qt_module" qt_parse_all_arguments(arg "add_qt_module"
"NO_MODULE_HEADERS;STATIC;DISABLE_TOOLS_EXPORT;EXCEPTIONS;INTERNAL_MODULE" "NO_MODULE_HEADERS;STATIC;DISABLE_TOOLS_EXPORT;EXCEPTIONS;INTERNAL_MODULE;NO_SYNC_QT"
"CONFIG_MODULE_NAME" "CONFIG_MODULE_NAME"
"${__default_private_args};${__default_public_args};QMAKE_MODULE_CONFIG" ${ARGN}) "${__default_private_args};${__default_public_args};QMAKE_MODULE_CONFIG" ${ARGN})
@ -1087,7 +1087,7 @@ function(add_qt_module target)
qt_internal_add_target_aliases("${target_private}") qt_internal_add_target_aliases("${target_private}")
# Module headers: # Module headers:
if(${arg_NO_MODULE_HEADERS}) if(${arg_NO_MODULE_HEADERS} OR ${arg_NO_SYNC_QT})
set_target_properties("${target}" PROPERTIES MODULE_HAS_HEADERS OFF) set_target_properties("${target}" PROPERTIES MODULE_HAS_HEADERS OFF)
else() else()
# Use QT_BUILD_DIR for the syncqt call. # Use QT_BUILD_DIR for the syncqt call.

2
util/cmake/pro2cmake.py
View File

@ -1609,6 +1609,8 @@ def write_module(cm_fh: typing.IO[str], scope: Scope, *,
extra.append('INTERNAL_MODULE') extra.append('INTERNAL_MODULE')
if 'no_module_headers' in scope.get('CONFIG'): if 'no_module_headers' in scope.get('CONFIG'):
extra.append('NO_MODULE_HEADERS') extra.append('NO_MODULE_HEADERS')
if 'minimal_syncqt' in scope.get('CONFIG'):
extra.append('NO_SYNC_QT')
module_config = scope.get("MODULE_CONFIG") module_config = scope.get("MODULE_CONFIG")
if len(module_config): if len(module_config):