diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-05-06 13:08:58 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2019-05-06 11:09:44 +0000 |
| commit | 1ad4ae7e47c683d56ec08647ec58deeac9ddc51a (patch) | |
| tree | cca6b013d55243c361476e55a0d4645c17635af8 | |
| parent | 2bfa47c01b20710cac699bd749a498ac8c9faea6 (diff) | |
Qt Creator: Fix python type error
Change-Id: Ia1f1d0574a39ae31f13906119c41874be7410449
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -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 554fab4bf..9a20a2bb3 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -538,7 +538,7 @@ def get_qtcreator_version(path_to_qtcreator_src, optionDict): default_version_locations = [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 default_version_location = next(p for p in default_version_locations if os.path.exists(p)) - branding_version_location = optionDict.get('IDE_BRANDING_PRI'), # optional + branding_version_location = optionDict.get('IDE_BRANDING_PRI') # optional version_location = branding_version_location if branding_version_location else default_version_location with open(version_location, 'r') as f: |