From 6228d9ae260dd4a722487c8dff0897d745fb78ea Mon Sep 17 00:00:00 2001
From: "Kenneth Perry (thothonegan)" <thothonegan@gmail.com>
Date: Fri, 5 Feb 2016 14:52:28 -0600
Subject: [PATCH 1/2] If using Qt5, use Qt5LinguistTools to locate
 lupdate/lrelease

---
 CMakeLists.txt     | 1 +
 src/CMakeLists.txt | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 228c74eb5..9d88b665e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,6 +132,7 @@ IF(WANT_QT5)
 
 	FIND_PACKAGE(Qt5Core REQUIRED)
 	FIND_PACKAGE(Qt5Gui REQUIRED)
+	FIND_PACKAGE(Qt5LinguistTools REQUIRED)
 	FIND_PACKAGE(Qt5Widgets REQUIRED)
 	FIND_PACKAGE(Qt5Xml REQUIRED)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8045b86a4..fb7038c74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -132,6 +132,11 @@ IF(LMMS_BUILD_MSYS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
 	TARGET_LINK_LIBRARIES(lmms QtCore4 QtGui4 QtXml4)
 ENDIF()
 
+if (QT5)
+	set (QT_LUPDATE_EXECUTABLE "${Qt5_LUPDATE_EXECUTABLE}")
+	set (QT_LRELEASE_EXECUTABLE "${Qt5_LRELEASE_EXECUTABLE}")
+endif ()
+
 #
 # rules for building localizations
 #

From 45154d2e99e836efeec8532e63a4ee9a4c62ce99 Mon Sep 17 00:00:00 2001
From: "Kenneth Perry (thothonegan)" <thothonegan@gmail.com>
Date: Fri, 5 Feb 2016 15:08:12 -0600
Subject: [PATCH 2/2] Require linguist tools on Travis Ubuntu

---
 .travis/linux..install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/linux..install.sh b/.travis/linux..install.sh
index 1dfcd1615..4be588ae8 100644
--- a/.travis/linux..install.sh
+++ b/.travis/linux..install.sh
@@ -5,7 +5,7 @@ PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev  libogg-dev
 
 if [ $QT5 ]
 then
-	PACKAGES="$PACKAGES qtbase5-dev"
+	PACKAGES="$PACKAGES qtbase5-dev qttools5-dev-tools qttools5-dev"
 else
 	PACKAGES="$PACKAGES libqt4-dev"
 fi