diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-07 10:51:55 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-07 09:49:15 +0000 |
| commit | 38b1474c516810b7c1bef8d660ff594817f1cf08 (patch) | |
| tree | 4e3bd54b214a11a31fac27e29757c8584aa6fd5c | |
| parent | aa956e08229ee4884d88cc63b640b2cf19ef45d3 (diff) | |
Handle minimal_syncqt as not running syncqt for now
This is needed for QmlDevTools in qtdeclarative.
Change-Id: I41adec15f292c91192e171b45d1e5d48764c37c4
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 4 | ||||
| -rwxr-xr-x | util/cmake/pro2cmake.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index f2db5134da..30986c14fb 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1061,7 +1061,7 @@ function(add_qt_module target) # Process arguments: 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" "${__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}") # 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) else() # Use QT_BUILD_DIR for the syncqt call. diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 2eda9b69d3..0de5fce559 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -1609,6 +1609,8 @@ def write_module(cm_fh: typing.IO[str], scope: Scope, *, extra.append('INTERNAL_MODULE') if 'no_module_headers' in scope.get('CONFIG'): extra.append('NO_MODULE_HEADERS') + if 'minimal_syncqt' in scope.get('CONFIG'): + extra.append('NO_SYNC_QT') module_config = scope.get("MODULE_CONFIG") if len(module_config): |