diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-05-03 10:38:26 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2019-05-03 08:48:36 +0000 |
| commit | cf86c3e36fff40fff09bacecbd4310baa5757ea2 (patch) | |
| tree | da5eec8136d89d9894c8c4b0a973b3b034a77dea /packaging-tools/build_wrapper.py | |
| parent | b2884c2eeafa356a923531485840a5003d80681e (diff) | |
Qt Creator: Fix getting version if no special branding is used
Filter out "None" from the list of possible branding locations.
Change-Id: I90673cb9bfb0468b7933e0560140412b7b8626c3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'packaging-tools/build_wrapper.py')
| -rw-r--r-- | packaging-tools/build_wrapper.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index 9519f8e08..6a081e1bc 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -537,7 +537,7 @@ 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 - for path in possible_version_locations: + for path in [p for p in possible_version_locations if p]: with open(path, 'r') as f: for line in f: match = expr.match(line) |