From 3c717a63603b53b301370bdf7cdef12441582748 Mon Sep 17 00:00:00 2001 From: scrawl Date: Mon, 15 Feb 2016 14:38:58 +0100 Subject: [PATCH] Use Qt5 on travis to match the PPA's OSG build --- CI/before_install.linux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh index 1c02bc8d9..b8d8b45e2 100755 --- a/CI/before_install.linux.sh +++ b/CI/before_install.linux.sh @@ -11,11 +11,11 @@ sudo apt-get update -qq sudo apt-get install -qq libgtest-dev google-mock sudo apt-get install -qq libboost-filesystem-dev libboost-program-options-dev libboost-system-dev libboost-thread-dev sudo apt-get install -qq libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev -sudo apt-get install -qq libbullet-dev libopenscenegraph-dev libmygui-dev libsdl2-dev libunshield-dev libtinyxml-dev libopenal-dev libqt4-dev +sudo apt-get install -qq libbullet-dev libopenscenegraph-dev libmygui-dev libsdl2-dev libunshield-dev libtinyxml-dev libopenal-dev qtbase5-dev if [ "${ANALYZE}" ]; then sudo apt-get install -qq clang-3.6; fi sudo mkdir /usr/src/gtest/build cd /usr/src/gtest/build -sudo cmake .. -DBUILD_SHARED_LIBS=1 +sudo cmake .. -DBUILD_SHARED_LIBS=1 -DDESIRED_QT_VERSION=5 sudo make -j4 sudo ln -s /usr/src/gtest/build/libgtest.so /usr/lib/libgtest.so sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so