Use system-wide KF5 Item Models as shipped

Gbp-Pq: Name 2002_no-bundled-kitemmodels.patch

diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt
index 0fccd8bd73734d63ca432aae3d9275c91a6cae6c..aaff6f549cea52a52b896ae2fcc5ae40237d6c97 100644 (file)
--- a/master/CMakeLists.txt
+++ b/master/CMakeLists.txt
@@ -1,13 +1,11 @@
 INCLUDE(BuildVeyonApplication)
 INCLUDE(WindowsBuildHelpers)
 
-SET(kitemmodels_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/kitemmodels/src/core)
-SET(kitemmodels_SOURCES
-       ${kitemmodels_SOURCE_DIR}/kextracolumnsproxymodel.cpp
-       ${kitemmodels_SOURCE_DIR}/krecursivefilterproxymodel.cpp
-       ${kitemmodels_SOURCE_DIR}/kextracolumnsproxymodel.h
-       ${kitemmodels_SOURCE_DIR}/krecursivefilterproxymodel.h
-)
+# ECM setup
+set(KF5_MIN_VERSION "5.54.0")
+
+# find required KF5 Item Models
+FIND_PACKAGE(KF5ItemModels ${KF5_MIN_VERSION} CONFIG REQUIRED)
 
 FILE(GLOB master_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h)
 FILE(GLOB master_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/*.ui)
@@ -22,9 +20,9 @@ set(WITH_PCH OFF)
 remove_definitions(-DQT_NO_KEYWORDS)
 set_source_files_properties(${master_SOURCES} PROPERTIES COMPILE_DEFINITIONS QT_NO_KEYWORDS)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${kitemmodels_SOURCE_DIR})
-build_veyon_application(veyon-master ${master_SOURCES} ${master_INCLUDES} ${master_RESOURCES} ${kitemmodels_SOURCES})
-TARGET_LINK_LIBRARIES(veyon-master veyon-core)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
+build_veyon_application(veyon-master ${master_SOURCES} ${master_INCLUDES} ${master_RESOURCES})
+TARGET_LINK_LIBRARIES(veyon-master veyon-core KF5ItemModels)
 
 ADD_WINDOWS_RESOURCE(veyon-master)
 MAKE_GRAPHICAL_APP(veyon-master)

diff --git a/master/src/NetworkObjectOverlayDataModel.h b/master/src/NetworkObjectOverlayDataModel.h
index 713647dd9e60553ab86171300a6fe933d4ff6b0a..153ee481a3ccffeb7a59ea227ef13791db8e2828 100644 (file)
--- a/master/src/NetworkObjectOverlayDataModel.h
+++ b/master/src/NetworkObjectOverlayDataModel.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include "kextracolumnsproxymodel.h"
+#include <KF5/KItemModels/kextracolumnsproxymodel.h>
 #include "NetworkObject.h"
 
 class NetworkObjectOverlayDataModel : public KExtraColumnsProxyModel

diff --git a/master/src/RecursiveFilterProxyModel.h b/master/src/RecursiveFilterProxyModel.h
index be9328501bb816c31d3665a19e2d0de7cc72cc9e..4595bddde7686fd25b0519fe560d5432eb759d15 100644 (file)
--- a/master/src/RecursiveFilterProxyModel.h
+++ b/master/src/RecursiveFilterProxyModel.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include "krecursivefilterproxymodel.h"
+#include <KF5/KItemModels/krecursivefilterproxymodel.h>
 
 class RecursiveFilterProxyModel : public KRecursiveFilterProxyModel
 {