]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/16.04'
authorDavid Edmundson <kde@davidedmundson.co.uk>
Wed, 18 May 2016 09:13:16 +0000 (10:13 +0100)
committerDavid Edmundson <kde@davidedmundson.co.uk>
Wed, 18 May 2016 09:13:16 +0000 (10:13 +0100)
1  2 
CMakeLists.txt

diff --combined CMakeLists.txt
index 1d68183825d88f4b9c7f649cdfef2df4c32fe50a,436c45429ba8f8304a489b5a6110e1e85095dcdf..7e6111307d4d56d43e9b991c6f7d5481dcc3a89a
@@@ -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