From 61ad48058889c50dbf54637ddf4edecdbd2f52de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Tue, 20 Oct 2015 17:42:22 +0200
Subject: NOISSUE update travis to use Qt 5.5.1

---
 .travis.yml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0894e9d9..b639b03f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,8 @@
 language: cpp
 cache: apt
 notifications:
- email: false
+  irc: "irc.esper.net#MultiMC"
+  email: false
 
 # Build matrix set up
 compiler:
@@ -12,26 +13,13 @@ os:
  - linux
 # - osx
 env:
- - QT_VERSION=5.4.1 # latest stable
+ - QT_VERSION=5.5.1 # latest stable
 # - QT_VERSION=5.5-beta # latest
 matrix:
   exclude:
     # only use clang on OS X
     - os: osx
       compiler: gcc
-    # only use the qt available from homebrew
-    - os: osx
-      env: QT_VERSION=5.4.1
-    - os: osx
-      env: QT_VERSION=5.5-beta
-
-  allow_failures:
-    # Qt 5.5 is not yet released and is therefore allowed to fail
-    - env: QT_VERSION=5.5-beta
-
-notifications:
-  irc: "irc.esper.net#MultiMC"
-  email: false
 
 # Install dependencies
 install:
-- 
cgit v1.2.3