diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index bbd0b314db..3e30d42185 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -270,7 +270,7 @@ check_val '' PULSE -lpulse
 check_val '' SDL -lSDL SDL
 check_val '' SDL2 -lSDL2 SDL2
 
-if [ "$HAVE_QT" = "yes" ]; then
+if [ "$HAVE_QT" != 'no' ]; then
    check_pkgconf QT5CORE Qt5Core 5.2
    check_pkgconf QT5GUI Qt5Gui 5.2
    check_pkgconf QT5WIDGETS Qt5Widgets 5.2
@@ -283,6 +283,8 @@ if [ "$HAVE_QT" = "yes" ]; then
 
    if [ "$HAVE_QT5CORE" = "no" ] || [ "$HAVE_QT5GUI" = "no" ] || [ "$HAVE_QT5WIDGETS" = "no" ]; then
       die 1 'Error: Qt support requested, but required libraries could not be found.'
+   else
+      HAVE_QT=yes
    fi
 
    #if [ "$HAVE_QT5WEBENGINE" = "no" ]; then
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 09e89d63af..487bc003a5 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -101,7 +101,7 @@ HAVE_PRESERVE_DYLIB=no     # Enable dlclose() for Valgrind support
 HAVE_PARPORT=auto          # Parallel port joypad support
 HAVE_IMAGEVIEWER=yes       # Built-in image viewer support.
 HAVE_MMAP=auto             # MMAP support
-HAVE_QT=no                 # Qt companion support
+HAVE_QT=auto               # Qt companion support
 C89_QT=no
 HAVE_XSHM=no               # XShm video driver support
 HAVE_CHEEVOS=yes           # Retro Achievements
diff --git a/qb/qb.comp.sh b/qb/qb.comp.sh
index a0cced4537..e47d512df0 100644
--- a/qb/qb.comp.sh
+++ b/qb/qb.comp.sh
@@ -83,7 +83,7 @@ if [ "$OS" = "Win32" ]; then
 	echo "$echobuf ... $WINDRES"
 fi
 
-if [ "$HAVE_QT" = "yes" ]; then
+if [ "$HAVE_QT" != "no" ]; then
 	echobuf="Checking for moc"
 	if [ -z "$MOC" ]; then
 		MOC="$(exists "moc")" || MOC=""