From ddec2a561cd7e8608f3a266bebaadd7ee4f32330 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 15 Nov 2017 15:11:59 +0100
Subject: [beamergui] Use qt5

---
 core/modules/beamergui/module.build | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'core/modules/beamergui')

diff --git a/core/modules/beamergui/module.build b/core/modules/beamergui/module.build
index 36175c34..db1bc6a4 100644
--- a/core/modules/beamergui/module.build
+++ b/core/modules/beamergui/module.build
@@ -6,19 +6,16 @@ fetch_source() {
 
 build() {
 	local SRCDIR="${MODULE_WORK_DIR}/src/"
-	if [[ "$SYS_DISTRIBUTION" == "opensuse" && "$SYS_VERSION" == "13.2" ]]; then
-		QMAKE="/usr/$LIB64/qt4/bin/qmake"
-	else
-		QMAKE="$(which qmake-qt4)"
-	fi
+	QMAKE="$(which qmake-qt5)"
+	[ -z "$QMAKE" ] && QMAKE=qmake
 
-	# first activate qt 4
-	activate_qt 4
+	# first activate qt 5
+	activate_qt 5
 
 	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin"
 	cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!"
 	pinfo "Running qmake"
-	"$QMAKE" "$SRCDIR/src/beamergui.pro" -r -spec linux-g++ || perror "'qmake-qt4' failed (e.g. not installed)."
+	"$QMAKE" "$SRCDIR/src/beamergui.pro" -r -spec linux-g++ || perror "'$QMAKE' failed (e.g. not installed)."
 	pinfo "Running make"
 	make || perror "'make' failed."
 
-- 
cgit v1.2.3-55-g7522