]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/19.04'
authorNate Graham <nate@kde.org>
Sun, 24 Mar 2019 17:31:44 +0000 (11:31 -0600)
committerNate Graham <nate@kde.org>
Sun, 24 Mar 2019 17:31:44 +0000 (11:31 -0600)
1  2 
CMakeLists.txt

diff --combined CMakeLists.txt
index c522d9a899f6c13b8ac491e0a397b7836c23a78e,924ce51107c3c04f3a2d5db64543a9e93d5d65ee..474fbc839199b401e1219e4fa707b9062e020d30
@@@ -2,8 -2,8 +2,8 @@@ cmake_minimum_required(VERSION 3.0
  
  # KDE Application Version, managed by release script
  set (KDE_APPLICATIONS_VERSION_MAJOR "19")
 -set (KDE_APPLICATIONS_VERSION_MINOR "03")
 -set (KDE_APPLICATIONS_VERSION_MICRO "80")
 +set (KDE_APPLICATIONS_VERSION_MINOR "07")
 +set (KDE_APPLICATIONS_VERSION_MICRO "70")
  set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
  project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
  
@@@ -151,7 -151,5 +151,5 @@@ install(FILES ${CMAKE_CURRENT_BINARY_DI
  
  install( FILES dolphin.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
  
- install( FILES dolphin.khotkeys DESTINATION ${KDE_INSTALL_DATADIR}/khotkeys )
  feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)