fix: Removing Qt5::Gui for dde-dconfig

Remove Qt5::Gui for dde-dconfig. Add gitignore's entities. Log: Influence: Change-Id: I45bfb7aba7845f94fa6ee3c867e02a1f4cce3fb5
linuxdeepin · Feb 2, 2023 · 5426f36 · 5426f36
1 parent 5696e1c
commit 5426f36
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-CMakeLists.txt.user
+CMakeLists.txt.user*
+build*/
diff --git a/dconfig-center/common/helper.hpp b/dconfig-center/common/helper.hpp
@@ -12,8 +12,6 @@
 #include <QDBusArgument>
 #include <QJsonDocument>
 
-#include <DStandardPaths>
-
 using ResourceId = QString;
 using AppId = QString;
 using SubpathKey = QString;
@@ -107,7 +105,6 @@ static ResourceList resourcesForApp(const QString &appid, const QString &localPr
 
 static ResourceList resourcesForAllApp(const QString &localPrefix = QString())
 {
-    DCORE_USE_NAMESPACE;
     QDir resourceDir(QString("%1/%2").arg(localPrefix, MetaFileInstalledDir));
     QDirIterator iterator(resourceDir);
     QSet<ResourceId> result;

diff --git a/dconfig-center/dde-dconfig/CMakeLists.txt b/dconfig-center/dde-dconfig/CMakeLists.txt
@@ -6,8 +6,8 @@ PROJECT(dde-dconfig)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 set(REQUIRED_QT_VERSION 5.11.3)
-find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui DBus)
-find_package(DtkWidget REQUIRED)
+find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core DBus)
+find_package(DtkCore REQUIRED)
 
 # generate moc_predefs.h
 set(CMAKE_AUTOMOC ON)
@@ -39,17 +39,16 @@ ADD_EXECUTABLE(dde-dconfig ${HEADERS} ${SOURCES} ${DCONFIG_DBUS_XML})
 
 set(COMMON_LIBS
     Qt5::Core
-    Qt5::Gui
     Qt5::DBus
-    ${DtkWidget_LIBRARIES}
+    ${DtkCore_LIBRARIES}
 )
 
 target_link_libraries(${PROJECT_NAME} PUBLIC ${COMMON_LIBS})
 
 target_include_directories(${PROJECT_NAME} PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}
-    ${DtkWidget_INCLUDE_DIRS}
+    ${DtkCore_INCLUDE_DIRS}
     ../common
 )