From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Fri, 1 Jul 2016 09:37:01 +0000 (+0200)
Subject: Merge branch 'Applications/16.04'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c2c075011c0924fb6af3ae345f839620ea78afc2?hp=-c

Merge branch 'Applications/16.04'
---

c2c075011c0924fb6af3ae345f839620ea78afc2
diff --combined CMakeLists.txt
index 86b06e889,e0ebc79d8..7107818d1
--- 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 "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)