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