From 800cd1d8b966fcedf696618e669848bd9350a6df Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 13 Nov 2019 10:53:13 +0100 Subject: [PATCH] pro2cmake: Fix broken is_manual_test usage Amends 681e8b4ead432b2658b0be9f90454bbdbd80d1b1 Change-Id: I5ac8761de10d945b6ac78ba95a179209c80cb893 Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor --- util/cmake/pro2cmake.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 18ec08ad0ac..2c12c7a4ae3 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -249,7 +249,7 @@ def is_benchmark_project(project_file_path: str = "") -> bool: # relative to the repo source dir, then it must be a benchmark return project_relative_path.startswith("tests/benchmarks") -def is_manual_test(project_file_path: str = "") -> bool: +def is_manual_test_project(project_file_path: str = "") -> bool: qmake_conf_path = find_qmake_conf(project_file_path) qmake_conf_dir_path = os.path.dirname(qmake_conf_path) @@ -2817,7 +2817,7 @@ def write_binary(cm_fh: IO[str], scope: Scope, gui: bool = False, *, indent: int assert binary_name is_benchmark = is_benchmark_project(scope.file_absolute_path) - is_manual_test = is_manual_test(scope.file_absolute_path) + is_manual_test = is_manual_test_project(scope.file_absolute_path) is_qt_test_helper = "qt_test_helper" in scope.get("_LOADED")