Travis CI: remove Qt 4 builds

2 files changed, 6 insertions, 16 deletions

diff --git a/scripts/travis-ci/before_install.bash b/scripts/travis-ci/before_install.bash
index a46eb5ded..b05c5969d 100755
--- a/scripts/travis-ci/before_install.bash
+++ b/scripts/travis-ci/before_install.bash
@@ -15,16 +15,12 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
 	# See mumble-voip/mumble#3312 for more information.
 	echo 'Acquire::http::Timeout "120";' | sudo tee /etc/apt/apt.conf.d/99zzztimeout
 
-	if [ "${MUMBLE_QT}" == "qt4" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
-		sudo apt-get -qq update
-		sudo apt-get build-dep -qq mumble
-		sudo apt-get install libjack-jackd2-dev
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
+	if [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
 		sudo apt-get -qq update
 		sudo apt-get build-dep -qq mumble
 		sudo apt-get install libqt5sql5 libqt5sql5-sqlite qt5-default qttools5-dev qttools5-dev-tools qtbase5-dev qtbase5-dev-tools qttranslations5-l10n libqt5svg5-dev
 		sudo apt-get install libjack-jackd2-dev
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then
+	elif [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then
 		sudo dpkg --add-architecture i386
 		sudo apt-get -qq update
 		echo "deb https://dl.mumble.info/mirror/mirror.mxe.cc/repos/apt xenial main" | sudo tee /etc/apt/sources.list.d/mxe.list
@@ -43,7 +39,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
 			mxe-${MUMBLE_HOST_DEB}.static-ogg \
 			mxe-${MUMBLE_HOST_DEB}.static-vorbis \
 			mxe-${MUMBLE_HOST_DEB}.static-libsndfile
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then
+	elif [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then
 		sudo dpkg --add-architecture i386
 		sudo apt-get -qq update
 		echo "deb https://dl.mumble.info/mirror/mirror.mxe.cc/repos/apt xenial main" | sudo tee /etc/apt/sources.list.d/mxe.list
diff --git a/scripts/travis-ci/script.bash b/scripts/travis-ci/script.bash
index 7c0d6f917..c89026706 100755
--- a/scripts/travis-ci/script.bash
+++ b/scripts/travis-ci/script.bash
@@ -12,13 +12,7 @@ if [ "${TRAVIS_REPO_SLUG}" == "mumble-voip/mumble" ] && [ "${TRAVIS_PULL_REQUEST
 fi
 
 if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
-	if [ "${MUMBLE_QT}" == "qt4" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
-		EXTRA_CONFIG=
-		if [ "${MUMBLE_NO_PCH}" == "1" ]; then
-			EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}"
-		fi
-		qmake-qt4 CONFIG+="release tests g15-emulator qt4-legacy-compat ${EXTRA_CONFIG}" -recursive && make -j2 && make check
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
+	if [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then
 		EXTRA_CONFIG=PREFIX=/usr
 		if [ "${MUMBLE_NO_PCH}" == "1" ]; then
 			EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}"
@@ -51,7 +45,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
 				bash upload.sh Mumble*.AppImage*
 			fi
 		fi
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then
+	elif [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then
 		wget http://www.steinberg.net/sdk_downloads/asiosdk2.3.zip -P ../
 		unzip ../asiosdk2.3.zip -d ../
 		mv ../ASIOSDK2.3 3rdparty/asio
@@ -64,7 +58,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
 		${MUMBLE_HOST}.static-qmake-qt5 -recursive -Wall CONFIG+="release tests warnings-as-errors g15-emulator no-overlay no-bonjour no-elevation no-ice ${EXTRA_CONFIG}"
 		make -j2
 		make check TESTRUNNER="wine"
-	elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then
+	elif [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then
 		wget http://www.steinberg.net/sdk_downloads/asiosdk2.3.zip -P ../
 		unzip ../asiosdk2.3.zip -d ../
 		mv ../ASIOSDK2.3 3rdparty/asio