From cc664a3129da62d68b4eea046fac2240f9ea0344 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 4 Oct 2016 22:51:17 +0200 Subject: [PATCH] Travis: Configure travis to compile specifically with Qt5.7 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 89e276f5d..0ba5f68ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,10 +28,11 @@ matrix: # install dependencies install: - sudo add-apt-repository -y 'ppa:ubuntu-toolchain-r/test' + - sudo add-apt-repository -y 'ppa:beineri/opt-qt57-trusty' - sudo add-apt-repository -y 'deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.8 main' - wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo apt-get update -qq - - if [[ "$CODE_BUILD" == "1" ]]; then sudo apt-get install --allow-unauthenticated -y -qq libx11-dev mesa-common-dev libgl1-mesa-dev qt5-default libqt5x11extras5-dev libxcb-keysyms1-dev gdb clang-format-3.8 ; fi + - if [[ "$CODE_BUILD" == "1" ]]; then sudo apt-get install --allow-unauthenticated -y -qq libx11-dev mesa-common-dev libgl1-mesa-dev qt57-base qt57x11extras libxcb-keysyms1-dev gdb clang-format-3.8 ; fi - if [[ "$DOCS_BUILD" == "1" ]]; then sudo pip install --upgrade pip setuptools ; sudo pip install Sphinx sphinx-rtd-theme ; fi - if [[ "$CODE_BUILD" == "1" ]]; then clang-format-3.8 -i -style=file $(find pdblocate/ qrenderdoc/ renderdoc/ renderdoccmd/ renderdocshim/ -type f -regex '.*\(/3rdparty/\|/official/\|resource.h\).*' -prune -o -regex '.*\.\(c\|cpp\|h\)$' -print) ; fi - git clean -f @@ -39,5 +40,6 @@ install: script: - sh ./scripts/hash_version.sh + - . /opt/qt57/bin/qt57-env.sh - if [[ "$CODE_BUILD" == "1" ]]; then mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug .. && make ; fi - if [[ "$DOCS_BUILD" == "1" ]]; then cd docs/ && make html ; fi