Merge branch 'Applications/16.04'

diff --combined CMakeLists.txt
index 86b06e889b1b0b8ba3f3c1d99f4553016f864005,e0ebc79d8f95f59248172949522b57eb6e1a158a..7107818d140eb68413baf5e21b7c90a17c565310
--- 1/CMakeLists.txt
--- 2/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 "1")
+ set (KDE_APPLICATIONS_VERSION_MICRO "2")
  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
@@@ -102,8 -102,6 +102,8 @@@ else(
      )
  endif()
  
 +add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 +
  add_subdirectory(src)
  add_subdirectory(doc)