diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-11 18:56:47 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-12 10:12:50 +0000 |
| commit | 2c66bdde5a79f1597ca9bb610d4d51a7a4ec61c1 (patch) | |
| tree | 1ee399455c3a0843c0127e7ac51e7ccf8b396203 /util | |
| parent | 37ab7eae9de557ad58cf371a6ce049fdf7545e6e (diff) | |
pro2cmake: Skip errors regarding not found generated .pri files
A lot of project files include files like qtsqldrivers-config.pri
which do not exist when running pro2cmake. It should be safe to hide
this error messages when converting projects.
Change-Id: I4205010e537f67f9b276b4cb94ec30f847c43c68
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index d8168aa489..f3c9873e62 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -3403,7 +3403,10 @@ def do_include(scope: Scope, *, debug: bool = False) -> None: if not include_file: continue if not os.path.isfile(include_file): - print(f" XXXX: Failed to include {include_file}.") + generated_config_pri_pattern = re.compile(r"qt.+?-config\.pri$") + match_result = re.search(generated_config_pri_pattern, include_file) + if not match_result: + print(f" XXXX: Failed to include {include_file}.") continue include_result = parseProFile(include_file, debug=debug) |