From cbc711a6f851902ad031c868717382a39d30f497 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 2 May 2019 18:12:50 +0200 Subject: use the pathes Change-Id: I735c50f52d2f38470d0920f2218e1fba67931427 Reviewed-by: Tim Jenssen --- packaging-tools/build_wrapper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index 022c250fd..648219cc5 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -537,7 +537,8 @@ def get_qtcreator_version(path_to_qtcreator_src, optionDict): possible_version_locations = [optionDict.get('IDE_BRANDING_PRI'), # optional os.path.join(path_to_qtcreator_src, 'qtcreator_ide_branding.pri'), # used since QtCreator 4.10 os.path.join(path_to_qtcreator_src, 'qtcreator.pri')]# old path till 4.9, can be removed in the future - with open(os.path.join(path_to_qtcreator_src, 'qtcreator.pri'), 'r') as f: + for path in possible_version_locations: + with open(path, 'r') as f: for line in f: match = expr.match(line) if match: -- cgit v1.2.3