diff options
| -rwxr-xr-x | .ci/install.sh | 4 | ||||
| -rwxr-xr-x | .ci/script.sh | 1 | ||||
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | README.md | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/.ci/install.sh b/.ci/install.sh index 27e0609a..f81f9265 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -20,16 +20,16 @@ if [ $TRAVIS_OS_NAME == linux ]; then if [ -z "$QT_VERSION" ]; then QT_VERSION="592" + QT_PKG="59" fi - export QT_PKG=${QT_VERSION:0:2} - sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty sudo add-apt-repository -y ppa:george-edison55/cmake-3.x sudo apt-get update -qq sudo apt-get install -qq -y \ qt${QT_PKG}base \ qt${QT_PKG}tools \ + qt${QT_PKG}svg \ qt${QT_PKG}multimedia \ cmake \ liblmdb-dev diff --git a/.ci/script.sh b/.ci/script.sh index 227e1696..a954eba6 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -3,7 +3,6 @@ set -ex if [ $TRAVIS_OS_NAME == linux ]; then - QT_PKG=${QT_VERSION:0:2} source /opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh || true; fi diff --git a/.travis.yml b/.travis.yml index f429d721..5454b68c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,8 @@ matrix: env: - CXX_COMPILER=g++-7 - C_COMPILER=gcc-7 - - QT_VERSION=592 + - QT_VERSION="-5.10.1" + - QT_PKG=510 - DEPLOYMENT=1 addons: apt: @@ -31,6 +32,7 @@ matrix: - CXX_COMPILER=g++-7 - C_COMPILER=gcc-7 - QT_VERSION=571 + - QT_PKG=57 addons: apt: sources: ["ubuntu-toolchain-r-test"] @@ -41,6 +43,7 @@ matrix: - CXX_COMPILER=clang++-5.0 - C_COMPILER=clang-5.0 - QT_VERSION=592 + - QT_PKG=59 addons: apt: sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] @@ -89,7 +89,7 @@ Debian as the build host in an attempt to work around this [issue](https://githu ##### Arch Linux ```bash -sudo pacman -S qt5-base qt5-tools qt5-multimedia cmake gcc fontconfig lmdb +sudo pacman -S qt5-base qt5-tools qt5-multimedia qt5-svg cmake gcc fontconfig lmdb ``` ##### Gentoo Linux @@ -105,7 +105,7 @@ sudo add-apt-repository ppa:beineri/opt-qt592-trusty sudo add-apt-repository ppa:george-edison55/cmake-3.x sudo add-apt-repository ppa:ubuntu-toolchain-r-test sudo apt-get update -sudo apt-get install -y g++-7 qt59base qt59tools qt59multimedia cmake liblmdb-dev +sudo apt-get install -y g++-7 qt59base qt59svg qt59tools qt59multimedia cmake liblmdb-dev ``` ##### macOS (Xcode 8 or later) |