This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from d0efa71 x2goclient.pro: simplify lrelease path preparing for different OS and cross compiling. Fixes: #901. new 7cb7c46 x2goclient.pro: reinstate old lrelease "search" behavior if qtPrepareTool() is not available. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 +++ x2goclient.pro | 9 +++++++++ 2 files changed, 12 insertions(+) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 7cb7c46e7aacbb39d6c794112e56f62ea7151a97 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 3 02:34:59 2015 +0200 x2goclient.pro: reinstate old lrelease "search" behavior if qtPrepareTool() is not available. This should only happen on EPEL 6, which ships a broken Qt4 version... --- debian/changelog | 3 +++ x2goclient.pro | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index b72a587..8e0c97c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,9 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: remove now-bogus double quote escaping. - sshmasterconnection.cpp: port QProcess::start () change. - sshprocess.cpp: whitespace/prettify only and a compile fix. + - x2goclient.pro: reinstate old lrelease "search" behavior if + qtPrepareTool() is not available. This should only happen on EPEL 6, + which ships a broken Qt4 version... [ Mike Gabriel ] * debian/control: diff --git a/x2goclient.pro b/x2goclient.pro index 9974177..97e8bdd 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -140,7 +140,16 @@ else { !isEmpty(TRANSLATIONS) { isEmpty(QMAKE_LRELEASE) { + # Some Qt versions (looking at you, EPEL 6) are broken + # and do not provide the qtPrepareTool test function. + # This section is only for working around bugs... + !defined(qtPrepareTool) { + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + } + else { 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
-
git-admin＠x2go.org