Bump the Qt version to 5.4 and the KF5 version to 5.7

Added all required components

Reviewed-By: David Edmundson

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a007f302710975c07365aaac61160f3f528259d..f31def98e19f10c05da56a54a4ff28cd1b250950 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,12 +2,16 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(Dolphin)
 
 
 project(Dolphin)
 

+set(DOLPHIN_VERSION "14.12.95")
+
+set(QT_MIN_VERSION "5.4.0")
+set(KF5_MIN_VERSION "5.7.0")
+set(ECM_MIN_VERSION "1.6.0")
+

 # ECM setup
 # ECM setup

-find_package(ECM 1.6.0 CONFIG REQUIRED)
+find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED)

 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 

-set(DOLPHIN_VERSION "4.97.0")
-

 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(ECMPackageConfigHelpers)
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(ECMPackageConfigHelpers)


@@ -27,8 +31,32 @@ ecm_setup_version(${DOLPHIN_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE
                   SOVERSION 5
 )
 
                   SOVERSION 5
 )
 

-find_package(KF5 REQUIRED COMPONENTS DocTools Init KCMUtils KDELibs4Support NewStuff CoreAddons I18n DBusAddons)
-find_package(KF5 COMPONENTS Activities)
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+    Core
+    Widgets
+    Gui
+    DBus
+    Test
+)
+
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+    DocTools
+    Init
+    KCMUtils
+    KDELibs4Support
+    NewStuff
+    CoreAddons
+    I18n
+    DBusAddons
+    Bookmarks
+    Config
+    KIO
+    Parts
+    Solid
+)
+find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS
+    Activities
+)

 
 find_package(Phonon4Qt5 CONFIG REQUIRED)
 
 
 find_package(Phonon4Qt5 CONFIG REQUIRED)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2b65671da5b464584a97ba84930743a91cfb1385..94aa5a51caa7bad8eb2b3427a5b6518124e097ae 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ configure_file(config-baloo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-baloo.h)
 
 configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin.h)
 
 
 configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin.h)
 

-add_definitions(-DTRANSLATION_DOMAIN=\"dolphin\")
+add_definitions(-DTRANSLATION_DOMAIN=\"dolphin\" -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)

 remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_URL_CAST_FROM_STRING)
 
 if(X11_Xrender_FOUND)
 remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_URL_CAST_FROM_STRING)
 
 if(X11_Xrender_FOUND)

diff --git a/src/main.cpp b/src/main.cpp
index b8eb9a556ceeb1c0349141765f39260ba2ba60fa..e8d6c2d298d1bf37174b3108de0a6ddcca0ca18f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -41,7 +41,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 
     app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
 
 
     app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
 

-    KAboutData aboutData("dolphin", i18n("Dolphin"), "4.60",
+    KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95",

                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
                          i18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
                          i18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));