From d1f930ff57952240e4c44fa8195df8e96dcb8019 Mon Sep 17 00:00:00 2001 From: Gres Date: Sat, 26 Dec 2015 14:36:16 +0300 Subject: [PATCH] Use of correct lrelease tool --- scripts/make_app.sh | 2 +- scripts/options.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/make_app.sh b/scripts/make_app.sh index 90388bb..afaede9 100755 --- a/scripts/make_app.sh +++ b/scripts/make_app.sh @@ -6,7 +6,7 @@ cleanupDirInNeeded $APP_DIR cd $APP_DIR echo "Building app" -lrelease $QT_CHOOSER $SRC_DIR/ScreenTranslator.pro +$QT_LRELEASE $QT_CHOOSER $SRC_DIR/ScreenTranslator.pro $QMAKE $QT_CHOOSER "CONFIG-=debug_and_release" "CONFIG+=release" $SRC_DIR make $JOBS diff --git a/scripts/options.sh b/scripts/options.sh index f824fe7..2bb1144 100755 --- a/scripts/options.sh +++ b/scripts/options.sh @@ -7,6 +7,7 @@ CLEAN=false JOBS="" QT_CHOOSER="-qt=qt5" QMAKE=qmake +QT_LRELEASE=lrelease QT_LIB_DIR=/usr/lib/x86_64-linux-gnu STRIP=strip @@ -17,6 +18,7 @@ for arg in ${@}; do "clean" ) CLEAN=true;; "-j"* ) JOBS=$arg;; *"qmake" ) QMAKE=$arg + QT_LRELEASE=`readlink -e $(dirname $arg)/lrelease` QT_LIB_DIR=`readlink -e $(dirname $arg)/../lib` QT_CHOOSER="" ;;