diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-25 09:49:57 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-25 13:23:50 +0200 |
| commit | c6412a34f038310117bdb284cbfbdbca5f19067a (patch) | |
| tree | 6121f6cae4072714806ebcbcd31bd70e30d6487b /scripts | |
| parent | 97a4384354b00a1c0baa00414916fae23f53e09b (diff) | |
testpackage.py: Fix stocqt example mistakenly added to tests in 5.14
The qt_version_less_than() helper had the checks the wrong
way around. Use tuple comparison to simplify this.
Change-Id: I2237e8e0521c3afead08607676b6d0f2b1eebe0e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/packagetesting/testpackage.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/scripts/packagetesting/testpackage.py b/scripts/packagetesting/testpackage.py index 0ab57138..13279391 100644 --- a/scripts/packagetesting/testpackage.py +++ b/scripts/packagetesting/testpackage.py @@ -44,22 +44,14 @@ and run them. Supported platforms: Linux, Windows (MSVC/MinGW), Windows UWP """ -qt_version = [0, 0, 0] +qt_version = (0, 0, 0) qt_mkspec = '' qt_examples_path = '' make_command = '' def qt_version_less_than(major, minor, patch): - if major < qt_version[0]: - return True - elif major > qt_version[0]: - return False - if minor < qt_version[1]: - return True - elif minor > qt_version[1]: - return False - return patch < qt_version[2] + return qt_version < (major, minor, patch) def examples(): @@ -93,8 +85,7 @@ def query_qmake(): if line.startswith('QMAKE_XSPEC:'): qt_mkspec = line[12:] elif line.startswith('QT_VERSION:'): - for v, version_string in enumerate(line[11:].split('.')): - qt_version[v] = int(version_string) + qt_version = tuple(int(v) for v in line[11:].split('.')) elif line.startswith('QT_INSTALL_EXAMPLES:'): qt_examples_path = line[20:] else: |