summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-05-16 23:19:33 +0200
committerPetr Mrázek <peterix@gmail.com>2015-05-16 23:19:33 +0200
commit44d76f5d820adf75dd37a1904af0fadfe9ee08e4 (patch)
tree1e5b2e4ea37308b43b44ddd6a0af91c7eb224589
parentff715f77854c84ef7bce446ca5b48190d64b45a9 (diff)
downloadMultiMC-44d76f5d820adf75dd37a1904af0fadfe9ee08e4.tar
MultiMC-44d76f5d820adf75dd37a1904af0fadfe9ee08e4.tar.gz
MultiMC-44d76f5d820adf75dd37a1904af0fadfe9ee08e4.tar.lz
MultiMC-44d76f5d820adf75dd37a1904af0fadfe9ee08e4.tar.xz
MultiMC-44d76f5d820adf75dd37a1904af0fadfe9ee08e4.zip
NOISSUE change travis to Qt 5.3
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 978c97e9..ad0bdee5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,18 +4,18 @@ compiler:
- clang
cache: apt
before_install:
- - sudo apt-add-repository -y ppa:beineri/opt-qt521
+ - sudo apt-add-repository -y ppa:beineri/opt-qt532
- sudo apt-add-repository -y ppa:kalakris/cmake
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get update -qq
install:
- - sudo apt-get install -y -qq cmake qt52base qt52svg qt52tools qt52x11extras qt52webkit
+ - sudo apt-get install -y -qq cmake qt53base qt53svg qt53tools qt53x11extras qt53webkit
- sudo apt-get install -y -qq g++-4.8
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
before_script:
- mkdir build
- cd build
- - cmake -DCMAKE_PREFIX_PATH=/opt/qt52/lib/cmake ..
+ - cmake -DCMAKE_PREFIX_PATH=/opt/qt53/lib/cmake ..
script:
- make -j4
- make test ARGS="-V"