fix: Remove Qt5 dependencies

CMakeLists.txt

@@ -51,11 +51,11 @@ endif()
 include(GNUInstallDirs)
 
 add_subdirectory("src")
-add_subdirectory("src-old")
-add_subdirectory("dcc-network-plugin")
+# add_subdirectory("src-old")
+# add_subdirectory("dcc-network-plugin")
 add_subdirectory("dcc-network")
 add_subdirectory("tests")
-add_subdirectory("example")
+# add_subdirectory("example")
 #add_subdirectory("dock-network-plugin")
 add_subdirectory("dss-network-plugin")
 add_subdirectory("dss_example")

debian/control

@@ -5,17 +5,11 @@ Maintainer: donghualin <donghualin@uniontech.com>
 Build-Depends: debhelper-compat (= 12),
                cmake,
                libglib2.0-dev (>= 2.32),
-               libgsettings-qt-dev,
                pkg-config,
-               qtbase5-dev,
-               qttools5-dev-tools,
                libgtest-dev,
-               libkf5networkmanagerqt-dev (>= 5.90.0),
-               libdtkwidget-dev,
                dde-control-center-dev,
                dde-session-shell-dev,
-               libudev-dev,
-               qttools5-dev,
+               libudev-dev,               
                qt6-base-dev,
                qt6-declarative-dev,
                qt6-tools-dev,

debian/libdde-network-core-dev.install

@@ -1,3 +1,2 @@
 usr/include/libddenetworkcore
-usr/lib/*/libdde-network-core.so
 usr/lib/*/pkgconfig/dde-network-core.pc

tests/CMakeLists.txt

@@ -8,24 +8,15 @@ set(CMAKE_USE_PTHREADS_INIT 1)
 set(CMAKE_PREFER_PTHREAD_FLAG ON)
 
 set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_PREFIX_PATH $ENV{Qt5_DIR})
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(Qt5 COMPONENTS Core DBus Network REQUIRED)
+find_package(Qt6 COMPONENTS Core Widgets DBus Network REQUIRED)
+find_package(Dtk6 COMPONENTS Core REQUIRED)
 find_package(GTest REQUIRED)
-find_package(KF5NetworkManagerQt REQUIRED)
-find_package(Qt5Widgets REQUIRED)
+find_package(KF6NetworkManagerQt REQUIRED)
 find_package(PkgConfig REQUIRED)
 
-get_target_property(KF5_QT_INCLUDE_DIRS KF5::NetworkManagerQt INTERFACE_INCLUDE_DIRECTORIES)
-
-foreach(LETTER ${TRY_KF5_LIBRARIES})
-    if (NOT KF5_QT_LIBRARIES)
-        get_target_property(KF5_QT_LIBRARIES KF5::NetworkManagerQt ${LETTER})
-    endif()
-endforeach()
-
 # 用于测试覆盖率的编译条件
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage -lgcov")
 
@@ -35,40 +26,27 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address -O2")
 endif()
 
-if (NOT KF5_QT_LIBRARIES)
-    find_library(KF5_QT_LIBRARIES libKF5NetworkManagerQt.so)
-endif()
-
-set(TRY_KF5_LIBRARIES
-IMPORTED_LOCATION_DEBIAN
-IMPORTED_LOCATION_NOCONFIG
-)
-
 aux_source_directory(. FILES)
 
 add_executable(${PROJECT_NAME} ${FILES})
 
 target_include_directories(${PROJECT_NAME} PUBLIC
-    ${QGSettings_INCLUDE_DIRS}
-    #${LibNM_INCLUDE_DIRS}
-    ${Qt5Network_INCLUDE_DIRS}
-    ${Qt5Widget_INCLUDE_DIRS}
-    ${KF5_QT_INCLUDE_DIRS}
-    ${NETINTERFACEINCLUDE}
-    ../src-old)
+    Qt6::Core
+    Qt6::Network
+    Dtk6::Core
+    KF6::NetworkManagerQt
+    ../src
+    ../src/impl
+)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
-    ${Qt5Core_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
-    #${LibNM_LIBRARIES}
-    ${Qt5Network_LIBRARIES}
-    ${Qt5DBus_LIBRARIES}
-    ${Qt5Test_LIBRARIES}
-    ${Qt5Network_LIBRARIES}
+    Qt6::Core
+    Qt6::Widgets
+    Qt6::Network
+    Dtk6::Core
+    KF6::NetworkManagerQt
     ${GTEST_LIBRARIES}
-    ${QGSettings_LIBRARIES}
-    ${KF5_QT_LIBRARIES}
     -lpthread
     -lm
-    dde-network-core
+    dde-network-core6
 )