From: Michael Palimaka <kensington@gentoo.org>
Date: Fri, 25 Sep 2015 19:38:06 +0000 (+1000)
Subject: Merge branch 'Applications/15.08'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/8a56637663a6c5305b9ec244588e50eb8399e95b?hp=-c

Merge branch 'Applications/15.08'
---

8a56637663a6c5305b9ec244588e50eb8399e95b
diff --combined CMakeLists.txt
index a5580e9e0,d926e9f0b..8f1e2835d
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -5,7 -5,7 +5,7 @@@ project(Dolphin
  # KDE Application Version, managed by release script
  set (KDE_APPLICATIONS_VERSION_MAJOR "15")
  set (KDE_APPLICATIONS_VERSION_MINOR "08")
- 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")
@@@ -29,13 -29,13 +29,13 @@@ ecm_setup_version(${KDE_APPLICATIONS_VE
                    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
  )
  
 -ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINVCS
 +ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINVCS
                    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h"
                    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake"
                    SOVERSION 5
  )
  
 -ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE
 +ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINPRIVATE
                    SOVERSION 5
  )
  
@@@ -62,11 -62,11 +62,11 @@@ find_package(KF5 ${KF5_MIN_VERSION} REQ
      Solid
      IconThemes
      Completion
 -    TextEditor
 +    TextWidgets
      WindowSystem
      Notifications
  )
- find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS
+ find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
      Activities
  )