From 53b00bb05cbaf163ae5f65ffe97bac1640be6b9c Mon Sep 17 00:00:00 2001
From: Joe Garcia <joe.garcia@ssec.wisc.edu>
Date: Mon, 17 May 2021 17:33:21 -0500
Subject: [PATCH] qt5 for portable or non. no qt4 either way anymore
---
ShellB3/shallbethree.sh | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index d43a0226..8d40ff4b 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -11867,25 +11867,10 @@ mk_guibase(){
export madeagui=NO madeaqt5gui=NO
if notBuildPortable ; then
-
_find_cots QT5DIR bin/qmake $BASE $QT5DIR /sw/lib/qt5 /usr/lib64/qt5 /usr/lib/qt5 /opt/local /opt/local/libexec/qt5 /usr
-
- if isNotTrue madeaqt5gui ; then
- ( [ -n "${QT5DIR}" ] && mk_pyside2 ) && export madeagui=YES madeaqt5gui=YES
- resume_tracker
- fi
-
- if isNotTrue madeaqt5gui ; then
- ( [ -n "${QT5DIR}" ] && mk_pyqt5 ) && export madeagui=YES madeaqt5gui=YES
- resume_tracker
- fi
-
- if isTrue madeaqt5gui ; then
- ( mk_qtpy ) || echo "No QtPy wrapper for Qt UI" 1>&2
- resume_tracker
- fi
else
_find_cots QT5DIR bin/qmake $BASE $QT5DIR
+ fi
if isNotTrue madeaqt5gui ; then
( [ -n "${QT5DIR}" ] && mk_pyside2 ) && export madeagui=YES madeaqt5gui=YES
@@ -11901,8 +11886,6 @@ mk_guibase(){
resume_tracker
fi
- fi
-
isDarwin && export madeagui=YES
isTrue madeagui || oops "Couldn't figure out a GUI base to use. QT5, and Mac (QT5=${QT5DIR})"
--
GitLab