Merge branch 'Applications/16.04'

diff --combined CMakeLists.txt
index bd4732932d139720b1136cf442f569958946579b,ec82cba5671970dc68fe45b23e4787ef6bcdc8f4..1d68183825d88f4b9c7f649cdfef2df4c32fe50a
--- 1/CMakeLists.txt
--- 2/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