From 75b532a4a189bec033b7663c2221f7e1633a51e6 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Fri, 23 May 2014 11:40:12 +0200
Subject: [PATCH] [Build] Try to use only "lrelease" binary from PATH with Qt5

If the lrelease binary is not in QT_INSTALL_BINS/lrelease, try to use
just lrelease from PATH with Qt5, instead of incorrectly trying to use
lrelease-qt4
---
 src/defines.pri | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/defines.pri b/src/defines.pri
index 9ed2f118d..9dd5aa224 100644
--- a/src/defines.pri
+++ b/src/defines.pri
@@ -141,10 +141,11 @@ equals(d_disable_updates_check, "true") { DEFINES *= DISABLE_UPDATES_CHECK }
 isEmpty(QMAKE_LRELEASE) {
     win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
-    unix {
-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
-    } else {
-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
+
+    # Try to use lrelease from PATH
+    unix:!exists($$QMAKE_LRELEASE) {
+        isEqual(QT_MAJOR_VERSION, 4): QMAKE_LRELEASE = lrelease-qt4
+        else: QMAKE_LRELEASE = lrelease
     }
 }