1
0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-02 16:31:23 +00:00

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

Added all required components

Reviewed-By: David Edmundson
This commit is contained in:
Emmanuel Pescosta 2015-02-25 21:45:19 +01:00
parent aca62bee91
commit 8a7d9b6d2c
3 changed files with 36 additions and 8 deletions

View File

@ -2,11 +2,15 @@ cmake_minimum_required(VERSION 2.8.12)
project(Dolphin)
# ECM setup
find_package(ECM 1.6.0 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
set(DOLPHIN_VERSION "14.12.95")
set(DOLPHIN_VERSION "4.97.0")
set(QT_MIN_VERSION "5.4.0")
set(KF5_MIN_VERSION "5.7.0")
set(ECM_MIN_VERSION "1.6.0")
# ECM setup
find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(ECMSetupVersion)
include(ECMGenerateHeaders)
@ -27,8 +31,32 @@ ecm_setup_version(${DOLPHIN_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE
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)

View File

@ -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)
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)

View File

@ -41,7 +41,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
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"));