diff --git a/.travis/osx..install.sh b/.travis/osx..install.sh index 542b7bf472d..b4eb7060601 100755 --- 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 qt@5.5" +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 index aaaa56f2a04..1810d3860d2 100644 --- 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 qt@5.5)/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 index 7ca8b005ccd..28aa94c3be9 100644 --- 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: qt@5.5 preffered per https://bugreports.qt.io/browse/QTBUG-53533 EXECUTE_PROCESS( - COMMAND brew --prefix qt@5.5 + 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(