From 3c2aa878dceae77144e548eb839c7c76893874eb Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 19 Mar 2020 12:47:41 +0100 Subject: CMake: Skip inclusion of selfcover.pri MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do not process selfcover.pri in the conversion as the output requires a lot of special case fixs ups. Change-Id: Iebee484db887973369b5604344a6d486f4bea20b Reviewed-by: Tor Arne Vestbø Reviewed-by: Alexandru Croitor --- util/cmake/pro2cmake.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'util/cmake/pro2cmake.py') diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 238f903bcc..0aebb971f3 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -3987,6 +3987,10 @@ def do_include(scope: Scope, *, debug: bool = False) -> None: for include_index, include_file in enumerate(scope.get_files("_INCLUDED", is_include=True)): if not include_file: continue + # Ignore selfcover.pri as this generates too many incompatible flags + # need to be removed with special cases + if include_file.endswith("selfcover.pri"): + continue if include_file.startswith("${QT_SOURCE_TREE}"): root_source_dir = get_top_level_repo_project_path(scope.file_absolute_path) include_file = include_file.replace("${QT_SOURCE_TREE}", root_source_dir) -- cgit v1.2.3