From 8f389aa949f7ab152f3a44c90d643e3300b38d72 Mon Sep 17 00:00:00 2001
From: songwentao <songwentao@uniontech.com>
Date: Wed, 11 Aug 2021 13:46:04 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8E=BB=E6=8E=89=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

去掉编译警告

Log:
Task: https://pms.uniontech.com/zentao/task-view-59601.html
Change-Id: Ic1a69ec3f21f222b24ab176dcacb8090800e768d
---
 plugins/onboard/CMakeLists.txt  | 6 +-----
 plugins/onboard/onboarditem.cpp | 1 -
 plugins/tray/CMakeLists.txt     | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/plugins/onboard/CMakeLists.txt b/plugins/onboard/CMakeLists.txt
index da93399ce..4308513c7 100644
--- a/plugins/onboard/CMakeLists.txt
+++ b/plugins/onboard/CMakeLists.txt
@@ -8,21 +8,17 @@ file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp")
 
 find_package(PkgConfig REQUIRED)
 find_package(Qt5Widgets REQUIRED)
-find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} onboard.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
-target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
-                                                 ${Qt5DBus_INCLUDE_DIRS}
+target_include_directories(${PLUGIN_NAME} PUBLIC ${Qt5DBus_INCLUDE_DIRS}
                                                  ${DFrameworkDBus_INCLUDE_DIRS}
                                                  ../../interfaces)
 target_link_libraries(${PLUGIN_NAME} PRIVATE
-    ${DtkWidget_LIBRARIES}
     ${Qt5Widgets_LIBRARIES}
-    ${Qt5Svg_LIBRARIES}
     ${DFrameworkDBus_LIBRARIES}
 )
 
diff --git a/plugins/onboard/onboarditem.cpp b/plugins/onboard/onboarditem.cpp
index a7b293451..de72f24e0 100644
--- a/plugins/onboard/onboarditem.cpp
+++ b/plugins/onboard/onboarditem.cpp
@@ -21,7 +21,6 @@
 
 #include "onboarditem.h"
 
-#include <QSvgRenderer>
 #include <QPainter>
 #include <QPainterPath>
 #include <QMouseEvent>
diff --git a/plugins/tray/CMakeLists.txt b/plugins/tray/CMakeLists.txt
index 9fc1bd481..3e4815279 100644
--- a/plugins/tray/CMakeLists.txt
+++ b/plugins/tray/CMakeLists.txt
@@ -23,6 +23,7 @@ find_package(Qt5DBus REQUIRED)
 find_package(Qt5X11Extras REQUIRED)
 find_package(Qt5Concurrent REQUIRED)
 find_package(DtkWidget REQUIRED)
+find_package(dbusmenu-qt5 REQUIRED)
 
 pkg_check_modules(XCB_LIBS REQUIRED xcb-ewmh xcb xcb-image xcb-composite xtst x11 xext xcb-icccm dbusmenu-qt5)
 pkg_check_modules(DDE-Network-Utils REQUIRED dde-network-utils)
@@ -35,10 +36,10 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
                                                  ${Qt5DBus_INCLUDE_DIRS}
                                                  ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
-                                                 ${XCB_LIBS_INCLUDE_DIRS}
                                                  ${DDE-Network-Utils_INCLUDE_DIRS}
                                                  ${DFrameworkDBus_INCLUDE_DIRS}
                                                  ${QGSettings_INCLUDE_DIRS}
+                                                 ${dbusmenu-qt5_INCLUDE_DIRS}
                                                  ../../interfaces
                                                  ../../frame )
 target_link_libraries(${PLUGIN_NAME} PRIVATE
@@ -48,7 +49,6 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
     ${Qt5DBus_LIBRARIES}
     ${Qt5Svg_LIBRARIES}
     ${Qt5Concurrent_LIBRARIES}
-    ${XCB_LIBS_LIBRARIES}
     ${DDE-Network-Utils_LIBRARIES}
     ${DFrameworkDBus_LIBRARIES}
     ${QGSettings_LIBRARIES}