From ca13b6033b512c187c1e2d45a1959ea2af7ea29a Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 26 Nov 2020 09:31:37 +0100 Subject: [PATCH] Test aqtinstall for macosx. --- .travis.yml | 4 ---- resources/scripts/.travis-before-install.sh | 4 ++-- resources/scripts/.travis-install-osx.sh | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f04513b9..3c5b28d39 100755 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,6 @@ os: env: - USE_WEBENGINE=false - USE_WEBENGINE=true -jobs: - exclude: - - os: osx - env: USE_WEBENGINE=true compiler: - gcc notifications: diff --git a/resources/scripts/.travis-before-install.sh b/resources/scripts/.travis-before-install.sh index e70144532..b2ef84157 100755 --- a/resources/scripts/.travis-before-install.sh +++ b/resources/scripts/.travis-before-install.sh @@ -7,13 +7,13 @@ if test "$TRAVIS_OS_NAME" = "osx"; then brew update brew install p7zip brew link --force p7zip - brew install qt5 - brew link --force qt5 brew install curl brew link --force curl brew uninstall gnu-sed brew install gnu-sed brew link --force gnu-sed + + pip install aqtinstall else # 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 e744edab9..28b049bf6 100755 --- a/resources/scripts/.travis-install-osx.sh +++ b/resources/scripts/.travis-install-osx.sh @@ -1,9 +1,22 @@ #!/bin/sh +# 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 + # Build application. -ls mkdir rssguard-build && cd rssguard-build -lrelease -compress ../rssguard.pro qmake .. "USE_WEBENGINE=$USE_WEBENGINE" make make install @@ -16,7 +29,6 @@ install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dyli install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dylib" "rssguard" otool -L "RSS Guard.app/Contents/MacOS/rssguard" -otool -L "rssguard" make dmg