From d70ee1889dd42a0d10ba58537d488877a78011ee Mon Sep 17 00:00:00 2001
From: namark <nshan.nnnn@gmail.com>
Date: Tue, 18 Jan 2022 22:54:41 +0400
Subject: [PATCH] Fixed most linux distros unconditionally deemed too old to be
Qt.
---
hifi_qt.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hifi_qt.py b/hifi_qt.py
index eb3e945ddb..412eb798ce 100644
--- a/hifi_qt.py
+++ b/hifi_qt.py
@@ -144,12 +144,16 @@ endif()
if 'x86_64' == cpu_architecture:
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()
+ if distro.id() == 'ubuntu' or distro.id() == 'linuxmint':
+ 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()
else:
- self.__unsupported_error()
+ self.__no_qt_package_error()
+
elif 'aarch64' == cpu_architecture:
if distro.id() == 'ubuntu':