From: David Edmundson <kde@davidedmundson.co.uk>
Date: Wed, 18 May 2016 09:13:16 +0000 (+0100)
Subject: Merge branch 'Applications/16.04'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/b7ad5fb99d32d43fe4e083a8ffc2ebfbd046d2db?hp=-c

Merge branch 'Applications/16.04'
---

b7ad5fb99d32d43fe4e083a8ffc2ebfbd046d2db
diff --combined CMakeLists.txt
index 1d6818382,436c45429..7e6111307
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -5,11 -5,11 +5,11 @@@ project(Dolphin
  # KDE Application Version, managed by release script
  set (KDE_APPLICATIONS_VERSION_MAJOR "16")
  set (KDE_APPLICATIONS_VERSION_MINOR "04")
- set (KDE_APPLICATIONS_VERSION_MICRO "0")
+ set (KDE_APPLICATIONS_VERSION_MICRO "1")
  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