[X2Go-Commits] [x2goclient] 01/01: x2goclient.pro: simplify lrelease path preparing for different OS and cross compiling. Fixes: #901.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit d0efa71e5cc5d6144f57123cbdaf30f790c791ae
Author: Henning Heinold <henning at itconsulting-heinold.de>
Date:   Thu Jul 2 15:37:54 2015 +0200

    x2goclient.pro: simplify lrelease path preparing for different OS and cross compiling. Fixes: #901.
---
 debian/changelog |    5 +++++
 x2goclient.pro   |    3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91d4aac..b72a587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,11 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
         + VcXsrv's bundled version of openssl was updated from 1.0.2a
           to 1.0.2c (fixes the multiple CVEs announced on 2015-06-11)
 
+  [ Henning Heinold ]
+  * New upstream release (4.0.4.1):
+    - x2goclient.pro: simplify lrelease path preparing for different OS and
+      cross compiling. Fixes: #901.
+
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 May 2015 21:42:09 +0200
 
 x2goclient (4.0.4.0-0x2go1) unstable; urgency=low
diff --git a/x2goclient.pro b/x2goclient.pro
index ccf8fa7..9974177 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -140,8 +140,7 @@ else {
 
 !isEmpty(TRANSLATIONS) {
   isEmpty(QMAKE_LRELEASE) {
-    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
-    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+      qtPrepareTool(QMAKE_LRELEASE, lrelease)
   }
 
   isEmpty(TS_DIR):TS_DIR = .

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git