From 569180799dcfa030df03df2297c687c4da0853ae Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Wed, 18 Feb 2015 14:20:39 +0100
Subject: [PATCH 1/5] When compiling with qt5, require at least version 5.0.3

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 838bf4e1..92f85ef2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,8 @@ OPTION(UPDATE_TRANSLATIONS "Update translations on compile" OFF)
 MESSAGE("UPDATE TRANSLATIONS: ${UPDATE_TRANSLATIONS}")
 
 IF(NOT WITH_QT4)
-    FIND_PACKAGE(Qt5Widgets)
+    # First known not-broken Qt5 version (5.0.2 available on old ubuntus is buggy).
+    FIND_PACKAGE(Qt5Widgets 5.0.3)
 ENDIF()
 
 IF(Qt5Widgets_FOUND)

From 4de9da8b2b5cf02ab2a93871880f9fa12849a973 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Thu, 19 Feb 2015 14:45:38 +0100
Subject: [PATCH 2/5] Attempt to get travis compile using qt5.2

---
 travis-compile.sh      | 3 +++
 travis-dependencies.sh | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/travis-compile.sh b/travis-compile.sh
index 148169c6..96e095ed 100755
--- a/travis-compile.sh
+++ b/travis-compile.sh
@@ -8,5 +8,8 @@ prefix=""
 if [[ $TRAVIS_OS_NAME == "osx" && $QT4 == 0 ]]; then
   prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.4.0/"
 fi
+if [[ $TRAVIS_OS_NAME == "linux" && $QT4 == 0 ]]; then
+  prefix="-DCMAKE_PREFIX_PATH=/opt/qt52/lib/cmake/"
+fi
 cmake .. -DWITH_SERVER=1 -DWITH_QT4=$QT4 $prefix
 make -j2
diff --git a/travis-dependencies.sh b/travis-dependencies.sh
index 5878b513..df75a487 100755
--- a/travis-dependencies.sh
+++ b/travis-dependencies.sh
@@ -12,10 +12,9 @@ else
     sudo apt-get update -qq
     sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev
   else
-    sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
+    sudo add-apt-repository --yes ppa:beineri/opt-qt521
     sudo apt-get update -qq
-    sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev cmake\
-      qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools\
-      qttools5-dev qtmultimedia5-dev libqt5svg5-dev
+    sudo apt-get install -y libprotobuf-dev protobuf-compiler cmake libsqlite3-dev\
+      qt52base qt52webkit qt52tools qt52svg
   fi
 fi

From 11d77f8324fdf8af4bf8eb76d20fdc31d95846ac Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Thu, 19 Feb 2015 14:52:09 +0100
Subject: [PATCH 3/5] Even make is too old.. 2.8.9 is required, this repo
 offers 2.8.11

---
 travis-dependencies.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/travis-dependencies.sh b/travis-dependencies.sh
index df75a487..1e19fc23 100755
--- a/travis-dependencies.sh
+++ b/travis-dependencies.sh
@@ -12,7 +12,8 @@ else
     sudo apt-get update -qq
     sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev
   else
-    sudo add-apt-repository --yes ppa:beineri/opt-qt521
+    sudo add-apt-repository -y ppa:beineri/opt-qt521
+    sudo add-apt-repository -y ppa:kalakris/cmake
     sudo apt-get update -qq
     sudo apt-get install -y libprotobuf-dev protobuf-compiler cmake libsqlite3-dev\
       qt52base qt52webkit qt52tools qt52svg

From 623cbe8759c9e2ce41bdd1934a467b3e1064f314 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Thu, 19 Feb 2015 14:55:49 +0100
Subject: [PATCH 4/5] Added qt5multimedia

---
 travis-dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis-dependencies.sh b/travis-dependencies.sh
index 1e19fc23..63fdc24c 100755
--- a/travis-dependencies.sh
+++ b/travis-dependencies.sh
@@ -16,6 +16,6 @@ else
     sudo add-apt-repository -y ppa:kalakris/cmake
     sudo apt-get update -qq
     sudo apt-get install -y libprotobuf-dev protobuf-compiler cmake libsqlite3-dev\
-      qt52base qt52webkit qt52tools qt52svg
+      qt52base qt52webkit qt52tools qt52svg qt52multimedia
   fi
 fi

From 2034d3f7ffc3b779bc4b01d53c965b9e53124093 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Thu, 19 Feb 2015 15:11:06 +0100
Subject: [PATCH 5/5] linux+clang+qt5 works now, disable allow_failures

---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a1c468ff..8aa35794 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,4 @@ notifications:
     on_failure: change
     on_start: false
 matrix:
-  fast_finish: true
-  allow_failures:
-    - compiler: clang
-      os: linux
-      env: QT4=0
+  fast_finish: true
\ No newline at end of file