diff options
| author | Simon Rettberg | 2017-11-15 15:11:59 +0100 |
|---|---|---|
| committer | root | 2017-11-15 15:11:59 +0100 |
| commit | ddec2a561cd7e8608f3a266bebaadd7ee4f32330 (patch) | |
| tree | 71c2d4124e7233e54365b89ae39c8d16c7041dad | |
| parent | [beamergui] Fix mode setter (once again) (diff) | |
| download | mltk-ddec2a561cd7e8608f3a266bebaadd7ee4f32330.tar.gz mltk-ddec2a561cd7e8608f3a266bebaadd7ee4f32330.tar.xz mltk-ddec2a561cd7e8608f3a266bebaadd7ee4f32330.zip | |
[beamergui] Use qt5
| -rw-r--r-- | core/modules/beamergui/module.build | 13 |
1 files changed, 5 insertions, 8 deletions
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." |