Merge pull request #2545 from thothonegan/master-fix-qt5-needs-proper-linguist-tools

If using Qt5, use Qt5LinguistTools to locate lupdate/lrelease
This commit is contained in:
Tres Finocchiaro
2016-02-05 22:47:41 -05:00
3 changed files with 7 additions and 1 deletions

View File

@@ -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

View File

@@ -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)

View File

@@ -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
#