diff --git a/.travis-before-install.sh b/.travis-before-install.sh index 7ce8453df..0d25eebfb 100755 --- a/.travis-before-install.sh +++ b/.travis-before-install.sh @@ -4,10 +4,11 @@ if test "$TRAVIS_OS_NAME" = "osx"; then # Mac OS X. brew update brew install qt5 + brew link --force qt5 else # Linux. sudo add-apt-repository ppa:beineri/opt-qt57-trusty -y sudo apt-get update sudo apt-get -y install qt57tools qt57base qt57webengine - . /opt/qt57/bin/qt57-env.sh + bash /opt/qt57/bin/qt57-env.sh fi \ No newline at end of file diff --git a/src/core/feeddownloader.cpp b/src/core/feeddownloader.cpp index b936a6ca7..6cb04e9f0 100755 --- a/src/core/feeddownloader.cpp +++ b/src/core/feeddownloader.cpp @@ -24,6 +24,7 @@ #include #include #include +#include FeedDownloader::FeedDownloader(QObject *parent)