From de6aab846e4c2228596f3c61764d2fb04503924a Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Fri, 27 Nov 2020 06:25:13 +0100
Subject: [PATCH] Remove brew from macosx travis.

---
 resources/scripts/.travis-before-install.sh | 15 ---------------
 resources/scripts/.travis-install-osx.sh    | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/resources/scripts/.travis-before-install.sh b/resources/scripts/.travis-before-install.sh
index a40fd2590..a93e3b568 100755
--- a/resources/scripts/.travis-before-install.sh
+++ b/resources/scripts/.travis-before-install.sh
@@ -5,21 +5,6 @@ git fetch --tags
 if test "$TRAVIS_OS_NAME" = "osx"; then
   # Mac OS X.
   pip3 install aqtinstall
-  
-  # Install Qt.
-  QTPATH="$(pwd)/Qt"
-  QTVERSION="5.15.2"
-  QTBIN="$QTPATH/$QTVERSION/clang_64/bin"
-
-  echo "Qt bin directory is: $QTBIN"
-  echo "Qt will be installed to: $QTPATH"
-
-  aqt install -O "$QTPATH" 5.15.2 mac desktop clang_64 -m qtwebengine
-
-  export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins"
-  export PATH="$QTBIN:$PATH"
-
-  qmake --version
 elif test "$TRAVIS_OS_NAME" = "linux"; then
   # Linux.
   sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh
index 6cf55193c..4e9c34f6a 100755
--- a/resources/scripts/.travis-install-osx.sh
+++ b/resources/scripts/.travis-install-osx.sh
@@ -1,5 +1,21 @@
 #!/bin/sh
 
+# Install Qt. This needs to be done here, because some
+# variables need to be set.
+QTPATH="$(pwd)/Qt"
+QTVERSION="5.15.2"
+QTBIN="$QTPATH/$QTVERSION/clang_64/bin"
+
+echo "Qt bin directory is: $QTBIN"
+echo "Qt will be installed to: $QTPATH"
+
+aqt install -O "$QTPATH" 5.15.2 mac desktop clang_64 -m qtwebengine
+
+export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins"
+export PATH="$QTBIN:$PATH"
+
+qmake --version
+
 # Build application.
 mkdir rssguard-build && cd rssguard-build
 qmake .. "USE_WEBENGINE=$USE_WEBENGINE"