diff options
| author | Heiko Becker <[email protected]> | 2017-12-02 11:00:04 +0100 |
|---|---|---|
| committer | Heiko Becker <[email protected]> | 2017-12-02 11:00:04 +0100 |
| commit | 2e6450da1cc62c0c8ad6f868becf0fa4a1f32022 (patch) | |
| tree | f8c32a976c155cac00842975a9db108fba4e1d8b | |
| parent | 89e4e8dd0a589c99e451e9f0aa4855e5720652ad (diff) | |
| parent | cd90c04343ba73568c79cad5fa7afb7557460d5e (diff) | |
Merge remote-tracking branch 'origin/Applications/17.12'
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | DolphinVcsConfig.cmake.in | 2 | ||||
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.h | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a39d6288..558e67613 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) include(ECMSetupVersion) include(ECMGenerateHeaders) -include(ECMPackageConfigHelpers) +include(CMakePackageConfigHelpers) include(GenerateExportHeader) include(FeatureSummary) include(KDEInstallDirs) @@ -108,7 +108,7 @@ add_subdirectory(doc) # CMake files set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/DolphinVcs") -ecm_configure_package_config_file( +configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/DolphinVcsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff --git a/DolphinVcsConfig.cmake.in b/DolphinVcsConfig.cmake.in index 7e7a2296f..f544f4c61 100644 --- a/DolphinVcsConfig.cmake.in +++ b/DolphinVcsConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) + find_dependency(Qt5Widgets) find_dependency(KF5KIO) diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h index b13c303bc..a9b832236 100644 --- a/src/kitemviews/kstandarditemlistwidget.h +++ b/src/kitemviews/kstandarditemlistwidget.h @@ -188,6 +188,9 @@ protected: public slots: void finishRoleEditing(); +public slots: + void finishRoleEditing(); + private slots: void slotCutItemsChanged(); void slotRoleEditingCanceled(const QByteArray& role, const QVariant& value); |