Bump to Qt5.10+

LMMS · Dec 16, 2017 · 4dcadee · 4dcadee
1 parent 5eed9cb
commit 4dcadee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/.travis/osx..install.sh b/.travis/osx..install.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-PACKAGES="cmake pkg-config fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk portaudio node fltk [email protected]"
+PACKAGES="cmake pkg-config fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk portaudio node fltk qt5"
 
 if "${TRAVIS}"; then
    PACKAGES="$PACKAGES ccache"

diff --git a/cmake/apple/install_apple.sh.in b/cmake/apple/install_apple.sh.in
@@ -16,8 +16,7 @@ MSG_COLOR='\x1B[1;36m'
 COLOR_RESET='\x1B[0m'
 echo -e "$MSG_COLOR\n\nCreating App Bundle \"$APP\"...$COLOR_RESET"
 
-# Prefer Qt 5.5 (QTBUG-53533)
-qtpath=$(brew --prefix [email protected])/bin
+qtpath=$(brew --prefix qt5)/bin
 
 # Fallback Qt 5.6+
 if [ ! -d "$qtpath" ]; then

diff --git a/cmake/modules/QtLocator.cmake b/cmake/modules/QtLocator.cmake
@@ -29,22 +29,12 @@ IF(APPLE)
 		OUTPUT_QUIET ERROR_QUIET
 	)
 	IF(NOT BREW_MISSING)
-		# TODO: [email protected] preffered per https://bugreports.qt.io/browse/QTBUG-53533
 		EXECUTE_PROCESS(
-			COMMAND brew --prefix [email protected]
+			COMMAND brew --prefix qt5
 			OUTPUT_VARIABLE QT_PATH
 			OUTPUT_STRIP_TRAILING_WHITESPACE
 			RESULT_VARIABLE QT_MISSING
 		)
-		# Fallback to qt5
-		IF(QT_MISSING)
-			EXECUTE_PROCESS(
-				COMMAND brew --prefix qt5
-				OUTPUT_VARIABLE QT_PATH
-				OUTPUT_STRIP_TRAILING_WHITESPACE
-				RESULT_VARIABLE QT_MISSING
-			)
-		ENDIF()
 	ELSE()
 		# qtcreator + mac
 		EXECUTE_PROCESS(