mirror of https://github.com/vitalif/openscad
Fix problem with check-dependencies.sh during detection of qt under
some circumstances. - If qtchooser is installed but qmake could not be found (either qt4 or qt5), the check would hang due to grep expecting input from stdin. - If qtchooser is installed but qmake for qt5 is not installed, the code would not actually check for the existence of qt4 qmake, since the test for ! -e $qtpath doesn't do what you want when $qtpath is empty.master
parent
e6557822f6
commit
47f5815b49
|
@ -167,7 +167,7 @@ qt_sysver()
|
|||
export QT_SELECT=5
|
||||
qtpath="`qtchooser -run-tool=qmake -qt=5 -query QT_INSTALL_HEADERS`"/QtCore/qglobal.h
|
||||
fi
|
||||
if [ ! -e $qtpath ]; then
|
||||
if [ ! -e "$qtpath" ]; then
|
||||
if qtchooser -run-tool=qmake -qt=4 -v >/dev/null 2>&1 ; then
|
||||
export QT_SELECT=4
|
||||
qtpath="`qtchooser -run-tool=qmake -qt=4 -query QT_INSTALL_HEADERS`"/QtCore/qglobal.h
|
||||
|
@ -193,10 +193,10 @@ qt_sysver()
|
|||
# netbsd
|
||||
qtpath=$1/qt4/include/QtCore/qglobal.h
|
||||
fi
|
||||
if [ ! -e $qtpath ]; then
|
||||
unset QT_SELECT
|
||||
return
|
||||
fi
|
||||
fi
|
||||
if [ ! -e "$qtpath" ]; then
|
||||
unset QT_SELECT
|
||||
return
|
||||
fi
|
||||
qtver=`grep 'define *QT_VERSION_STR *' $qtpath | awk '{print $3}'`
|
||||
qtver=`echo $qtver | sed s/'"'//g`
|
||||
|
|
Loading…
Reference in New Issue