diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 493b846838..5c9d3eff57 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.11.3
-revision=5
+revision=6
 wrksrc="qt-everywhere-src-${version}"
 build_style=gnu-configure
 hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config
@@ -156,7 +156,7 @@ _install_subpkg() {
 	rm -f ${PKGDESTDIR}/usr/lib/*.so
 	rm -f ${PKGDESTDIR}/usr/lib/*.prl
 	if [ -d ${PKGDESTDIR}/usr/lib/qt5/bin ]; then
-		if [ -n "$CROSS_BUILD" ]; then
+		if [ "$CROSS_BUILD" ]; then
 			for f in $(find ${PKGDESTDIR}/usr/lib/qt5/bin -name "*-target" -type f); do
 				base=${f##*/}
 				mv -v ${f} ${f%-target}
@@ -274,7 +274,7 @@ do_configure() {
 	esac
 
 	# Cross build patches
-	if [ -n "$CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		# This also sets default {C,CXX,LD}FLAGS for projects built using qmake
 		sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${XBPS_CFLAGS}|" \
 			${wrksrc}/qtbase/mkspecs/common/gcc-base.conf
@@ -376,7 +376,7 @@ do_configure() {
 	fi
 
 	LDFLAGS+=" -Wl,--no-keep-memory"  # needs more than 8GB RAM else
-	if [ -n "$CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		spec=void-${XBPS_CROSS_TRIPLET}-g++
 		_create_config ${spec}
 		opts+=" -device ${spec}"
@@ -435,7 +435,7 @@ do_install() {
 		ln -sf /usr/lib/qt5/bin/${base} ${PKGDESTDIR}/usr/bin/${base}-qt5
 	done
 
-	if [ -n "$CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		vmkdir usr/bin
 		vmkdir usr/lib/qt5/bin
 
@@ -1177,7 +1177,7 @@ qt5-qmake_package() {
 			-e '/^QMAKE_CFLAGS_ISYSTEM/s;-isystem;-I;'
 
 		# Undo changes to mkspecs/common/gcc-base.conf and g++-unix.conf
-		if [ -n "$CROSS_BUILD" ]; then
+		if [ "$CROSS_BUILD" ]; then
 			sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\) ${XBPS_CFLAGS}|\1|" \
 				${PKGDESTDIR}/usr/lib/qt5/mkspecs/common/gcc-base.conf
 			sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\) ${XBPS_LDFLAGS}|\1|" \