From 4e5e8788d5d1b3149cf36504a470453e70195d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 25 Dec 2021 23:49:49 +0100 Subject: [PATCH] choose right Qt version for Linux Mint 19.x --- hifi_qt.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/hifi_qt.py b/hifi_qt.py index b736a1433b..eb3e945ddb 100644 --- a/hifi_qt.py +++ b/hifi_qt.py @@ -142,18 +142,14 @@ endif() cpu_architecture = platform.machine() if 'x86_64' == cpu_architecture: - if distro.id() == 'ubuntu': - u_major = int( distro.major_version() ) - u_minor = int( distro.minor_version() ) - - if u_major == 18: - self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.15.2-ubuntu-18.04-amd64.tar.xz' - elif u_major > 19: - self.__no_qt_package_error() - else: - self.__unsupported_error() - else: + u_major = int( distro.major_version() ) + u_minor = int( distro.minor_version() ) + if (distro.id() == 'ubuntu' and u_major == 18) or distro.id() == 'linuxmint' and u_major == 19: + self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.15.2-ubuntu-18.04-amd64.tar.xz' + elif (distro.id() == 'ubuntu' and u_major > 18) or (distro.id() == 'linuxmint' and u_major > 19): self.__no_qt_package_error() + else: + self.__unsupported_error() elif 'aarch64' == cpu_architecture: if distro.id() == 'ubuntu':