From: Wolfgang Bauer <wbauer@tmo.at>
Date: Tue, 26 Apr 2016 14:17:59 +0000 (+0200)
Subject: Merge branch 'Applications/16.04'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/16e3d669de256aab86f957cd5b3bee91bd2fbbff?hp=-c

Merge branch 'Applications/16.04'
---

16e3d669de256aab86f957cd5b3bee91bd2fbbff
diff --combined CMakeLists.txt
index bd4732932,ec82cba56..1d6818382
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -4,12 -4,12 +4,12 @@@ project(Dolphin
  
  # KDE Application Version, managed by release script
  set (KDE_APPLICATIONS_VERSION_MAJOR "16")
- set (KDE_APPLICATIONS_VERSION_MINOR "03")
- set (KDE_APPLICATIONS_VERSION_MICRO "90")
+ set (KDE_APPLICATIONS_VERSION_MINOR "04")
+ set (KDE_APPLICATIONS_VERSION_MICRO "0")
  set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
  
  set(QT_MIN_VERSION "5.4.0")
 -set(KF5_MIN_VERSION "5.19.0")
 +set(KF5_MIN_VERSION "5.21.0")
  set(ECM_MIN_VERSION "1.6.0")
  
  # ECM setup