chore: fix build warning

fix package warning
1. replace deprecated QPalette::ColorRole Background and Foreground
2. replace deprecated Qt::SystemLocaleLongDate
3. replace deprecated QMouseEvent constructor
4. CMakeLists.txt rectification

log: remove build warnings

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -2,7 +2,7 @@ Source: dde-dock
 Section: x11
 Priority: optional
 Maintainer: Deepin Packages Builder <packages@deepin.com>
-Build-Depends: debhelper (>= 8.0.0),
+Build-Depends: debhelper-compat (= 10),
  pkg-config,
  cmake,
  qt5-qmake,
@@ -61,7 +61,7 @@ Description: deepin desktop-environment - dock module
 
 Package: dde-dock-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
 Description: deepin desktop-environment - dock module development files
  Dock module development files of deepin desktop-environment
 

frame/CMakeLists.txt

@@ -46,16 +46,8 @@ add_executable(${BIN_NAME}
 
 target_include_directories(${BIN_NAME} PUBLIC
     ${DtkWidget_INCLUDE_DIRS}
-    ${XCB_EWMH_INCLUDE_DIRS}
-    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
     ${PROJECT_BINARY_DIR}
-    ${QGSettings_INCLUDE_DIRS}
-    ${DtkGUI_INCLUDE_DIRS}
-    ${Qt5Svg_INCLUDE_DIRS}
-    ${dbusmenu-qt5_INCLUDE_DIRS}
-    ${Qt5WaylandClient_INCLUDE_DIRS}
     ${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS}
-    ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS}
     ../interfaces
     ../widgets
     ./dbusinterface/generation_dbus_interface

frame/screenspliter/screenspliter_wayland.cpp

@@ -10,12 +10,6 @@
 #include <QApplication>
 #include <QX11Info>
 #include <QtWaylandClient>
-#define private public
-#include <private/qwaylandintegration_p.h>
-#include <private/qwaylandshellsurface_p.h>
-#include <private/qwaylandwindow_p.h>
-#include <private/qwaylandcursor_p.h>
-#undef private
 
 #include <DWayland/Client/registry.h>
 #include <DWayland/Client/ddeshell.h>
@@ -58,7 +52,7 @@ void ScreenSpliter_Wayland::setMaskVisible(const QRect &rect, bool visible)
         DPalette palette = DGuiApplicationHelper::instance()->applicationPalette();
         QColor backColor = palette.color(QPalette::Highlight);
         backColor.setAlpha(255 * 0.3);
-        palette.setBrush(QPalette::ColorRole::Background, backColor);
+        palette.setBrush(QPalette::ColorRole::Window, backColor);
         desktopWidget->setPalette(palette);
         desktopWidget->setWindowFlags(Qt::FramelessWindowHint | Qt::Tool);
     }

frame/util/abstractpluginscontroller.cpp

@@ -156,15 +156,8 @@ void AbstractPluginsController::initPlugin(PluginsItemInterface *interface)
             m_pluginLoadMap.insert(pair, true);
     }
 
-    bool loaded = true;
-    for (int i = 0; i < m_pluginLoadMap.keys().size(); ++i) {
-        if (!m_pluginLoadMap.values()[i]) {
-            loaded = false;
-            break;
-        }
-    }
-
     qDebug() << objectName() << "init plugin finished: " << interface->pluginName();
+
 }
 
 bool AbstractPluginsController::eventFilter(QObject *object, QEvent *event)

frame/window/components/datetimedisplayer.cpp

@@ -241,9 +241,9 @@ void DateTimeDisplayer::onTimeChanged()
     const QDateTime currentDateTime = QDateTime::currentDateTime();
 
     if (m_timedateInter->use24HourFormat())
-        m_tipsWidget->setText(currentDateTime.date().toString(Qt::SystemLocaleLongDate) + currentDateTime.toString(" HH:mm:ss"));
+        m_tipsWidget->setText(QLocale().toString(currentDateTime.date()) + currentDateTime.toString(" HH:mm:ss"));
     else
-        m_tipsWidget->setText(currentDateTime.date().toString(Qt::SystemLocaleLongDate) + currentDateTime.toString(" hh:mm:ss AP"));
+        m_tipsWidget->setText(QLocale().toString(currentDateTime.date()) + currentDateTime.toString(" hh:mm:ss AP"));
 
     // 如果时间和日期有一个不等，则实时刷新界面
     if (m_lastDateString != getDateString() || m_lastTimeString != getTimeString())

frame/window/tray/widgets/indicatortrayitem.cpp

@@ -31,8 +31,8 @@ IndicatorTrayItem::IndicatorTrayItem(const QString &indicatorName, QWidget *pare
     m_label = new QLabel(this);
 
     QPalette p = m_label->palette();
-    p.setColor(QPalette::Foreground, Qt::white);
+    p.setColor(QPalette::WindowText, Qt::white);
-    p.setColor(QPalette::Background, Qt::transparent);
+    p.setColor(QPalette::Window, Qt::transparent);
     m_label->setPalette(p);
 
     m_label->setAttribute(Qt::WA_TranslucentBackground);
@@ -75,13 +75,13 @@ void IndicatorTrayItem::enableLabel(bool enable)
     QPalette p = m_label->palette();
     if (!enable) {
         m_enableClick = false;
-        p.setColor(QPalette::Disabled, QPalette::Foreground, Qt::lightGray);
+        p.setColor(QPalette::Disabled, QPalette::WindowText, Qt::lightGray);
-        p.setColor(QPalette::Disabled, QPalette::Background, Qt::transparent);
+        p.setColor(QPalette::Disabled, QPalette::Window, Qt::transparent);
         m_label->setEnabled(enable);
     } else {
         m_enableClick = true;
         p.setColor(QPalette::Normal, QPalette::BrightText, Qt::white);
-        p.setColor(QPalette::Normal, QPalette::Background, Qt::transparent);
+        p.setColor(QPalette::Normal, QPalette::Window, Qt::transparent);
         m_label->setEnabled(enable);
     }
 

frame/window/traymanagerwindow.cpp

@@ -290,7 +290,7 @@ void TrayManagerWindow::initUi()
     QPalette pal;
     QColor lineColor(Qt::black);
     lineColor.setAlpha(static_cast<int>(255 * 0.1));
-    pal.setColor(QPalette::Background, lineColor);
+    pal.setColor(QPalette::Window, lineColor);
     m_splitLine->setAutoFillBackground(true);
     m_splitLine->setPalette(pal);
 

plugins/airplane-mode/CMakeLists.txt

@@ -21,15 +21,14 @@ find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
-pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11 xcursor)
+pkg_check_modules(XCB_LIBS REQUIRED IMPORTED_TARGET xcursor)
-pkg_check_modules(QGSettings REQUIRED gsettings-qt)
+pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} resources/airplane_mode.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ..)
 
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
-  ${QGSettings_INCLUDE_DIRS}
   ../../interfaces
   ../../widgets
   ../../frame
@@ -38,11 +37,11 @@ target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
   ./dbusinterface/generation_dbus_interface)
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
-  ${XCB_EWMH_LIBRARIES}
   ${DtkWidget_LIBRARIES}
-  ${QGSettings_LIBRARIES}
+  PkgConfig::QGSettings
-  ${Qt5DBus_LIBRARIES}
+  PkgConfig::XCB_LIBS
-  ${Qt5Widgets_LIBRARIES}
+  Qt5::Widgets
-  ${Qt5Svg_LIBRARIES})
+  Qt5::DBus
+  Qt5::Svg)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/bluetooth/CMakeLists.txt

@@ -25,14 +25,13 @@ find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
-pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11 xcursor)
+pkg_check_modules(XCB_LIBS REQUIRED IMPORTED_TARGET xcursor)
-pkg_check_modules(QGSettings REQUIRED gsettings-qt)
+pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} resources/bluetooth.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../quick-trays)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
-  ${QGSettings_INCLUDE_DIRS}
   ../../interfaces
   ../../frame
   ../../frame/qtdbusextended
@@ -40,12 +39,11 @@ target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
   componments)
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
-  ${XCB_EWMH_LIBRARIES}
   ${DtkWidget_LIBRARIES}
-  ${QGSettings_LIBRARIES}
+  PkgConfig::QGSettings
-  ${Qt5DBus_LIBRARIES}
+  PkgConfig::XCB_LIBS
-  ${Qt5Widgets_LIBRARIES}
+  Qt5::Widgets
-  ${Qt5Svg_LIBRARIES}
+  Qt5::DBus
-)
+  Qt5::Svg)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/quick-trays)

plugins/bluetooth/componments/bluetoothapplet.cpp

@@ -40,7 +40,7 @@ SettingLabel::SettingLabel(QString text, QWidget *parent)
 
     setAutoFillBackground(true);
     QPalette p = this->palette();
-    p.setColor(QPalette::Background, Qt::transparent);
+    p.setColor(QPalette::Window, Qt::transparent);
     this->setPalette(p);
 
     onThemeTypeChanged(DGuiApplicationHelper::instance()->themeType());
@@ -300,13 +300,13 @@ void BluetoothApplet::updateIconTheme()
     QPalette widgetBackgroud;
     QPalette scroareaBackgroud;
     if(DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType)
-        widgetBackgroud.setColor(QPalette::Background, QColor(255, 255, 255, 0.03 * 255));
+        widgetBackgroud.setColor(QPalette::Window, QColor(255, 255, 255, 0.03 * 255));
     else
-        widgetBackgroud.setColor(QPalette::Background, QColor(0, 0, 0, 0.03 * 255));
+        widgetBackgroud.setColor(QPalette::Window, QColor(0, 0, 0, 0.03 * 255));
 
     m_contentWidget->setAutoFillBackground(true);
     m_contentWidget->setPalette(widgetBackgroud);
-    scroareaBackgroud.setColor(QPalette::Background, Qt::transparent);
+    scroareaBackgroud.setColor(QPalette::Window, Qt::transparent);
     m_scroarea->setAutoFillBackground(true);
     m_scroarea->setPalette(scroareaBackgroud);
 }

plugins/datetime/CMakeLists.txt

@@ -26,18 +26,16 @@ add_library(${PLUGIN_NAME} SHARED ${SRCS} datetime.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC 
   ${DtkWidget_INCLUDE_DIRS}
-  ${QGSettings_INCLUDE_DIRS}
   ../../interfaces
   ../../frame/qtdbusextended
   ./dbusinterface/
   ./dbusinterface/generation_dbus_interface)
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
-  ${Qt5DBus_LIBRARIES}
   ${DtkWidget_LIBRARIES}
-  ${Qt5Widgets_LIBRARIES}
+  PkgConfig::QGSettings
-  ${Qt5Svg_LIBRARIES}
+  Qt5::Widgets
-  ${QGSettings_LIBRARIES}
+  Qt5::DBus
-)
+  Qt5::Svg)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/display/CMakeLists.txt

@@ -24,14 +24,13 @@ find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
-pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11 xcursor)
+pkg_check_modules(XCB_LIBS REQUIRED IMPORTED_TARGET xcursor)
-pkg_check_modules(QGSettings REQUIRED gsettings-qt)
+pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} ./resource/display.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../quick-trays)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
-  ${QGSettings_INCLUDE_DIRS}
   ../../interfaces
   ../../widgets
   ../../frame
@@ -40,12 +39,11 @@ target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
   componments)
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
-  ${XCB_EWMH_LIBRARIES}
   ${DtkWidget_LIBRARIES}
-  ${QGSettings_LIBRARIES}
+  PkgConfig::QGSettings
-  ${Qt5DBus_LIBRARIES}
+  PkgConfig::XCB_LIBS
-  ${Qt5Widgets_LIBRARIES}
+  Qt5::Widgets
-  ${Qt5Svg_LIBRARIES}
+  Qt5::DBus
-)
+  Qt5::Svg)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/quick-trays)

plugins/keyboard-layout/CMakeLists.txt

@@ -17,13 +17,12 @@ find_package(Qt5Svg REQUIRED)
 find_package(DtkWidget REQUIRED)
 find_package(Qt5DBus REQUIRED)
 
-pkg_check_modules(QGSettings REQUIRED gsettings-qt)
+pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS})
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
-                                                 ${QGSettings_INCLUDE_DIRS}
                                                  ../../interfaces
                                                  ./dbusinterface
                                                  ./dbusinterface/generation_dbus_interface
@@ -31,11 +30,10 @@ target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
     ${DtkWidget_LIBRARIES}
-    ${QGSettings_LIBRARIES}
+    PkgConfig::QGSettings
-    ${Qt5Widgets_LIBRARIES}
+    Qt5::Widgets
-    ${Qt5Svg_LIBRARIES}
+    Qt5::DBus
-    ${Qt5DBus_LIBRARIES}
+    Qt5::Svg)
-)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/)
 install(FILES ./keybord_layout.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dde-dock/indicator)

plugins/media/CMakeLists.txt

@@ -24,14 +24,13 @@ find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
-pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11 xcursor)
+pkg_check_modules(XCB_LIBS REQUIRED IMPORTED_TARGET xcursor)
-pkg_check_modules(QGSettings REQUIRED gsettings-qt)
+pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS})
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../quick-trays)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
-  ${QGSettings_INCLUDE_DIRS}
   ../../interfaces
   ../../widgets
   ../../frame
@@ -40,12 +39,11 @@ target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
   componments)
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
-  ${XCB_EWMH_LIBRARIES}
   ${DtkWidget_LIBRARIES}
-  ${QGSettings_LIBRARIES}
+  PkgConfig::QGSettings
-  ${Qt5DBus_LIBRARIES}
+  PkgConfig::XCB_LIBS
-  ${Qt5Widgets_LIBRARIES}
+  Qt5::Widgets
-  ${Qt5Svg_LIBRARIES}
+  Qt5::DBus
-)
+  Qt5::Svg)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/quick-trays)

plugins/multitasking/CMakeLists.txt

@@ -13,16 +13,18 @@ find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
+pkg_check_modules(XCB_LIBS REQUIRED IMPORTED_TARGET xcursor)
+
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} resource.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} ../../interfaces)
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
-    ${Qt5DBus_LIBRARIES}
     ${DtkWidget_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
+    PkgConfig::XCB_LIBS
-    ${Qt5Svg_LIBRARIES}
+    Qt5::Widgets
-)
+    Qt5::DBus
+    Qt5::Svg)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/onboard/CMakeLists.txt

@@ -29,10 +29,9 @@ target_include_directories(${PLUGIN_NAME} PUBLIC ${Qt5DBus_INCLUDE_DIRS}
     ./dbusinterface/generation_dbus_interface)
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
-    ${Qt5Widgets_LIBRARIES}
-    ${Qt5DBus_LIBRARIES}
-    ${DtkGui_LIBRARIES}
     ${DtkWidget_LIBRARIES}
-)
+    Qt5::Widgets
+    Qt5::DBus
+    Dtk::Gui)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/overlay-warning/CMakeLists.txt

@@ -16,14 +16,12 @@ add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} overlay-warning.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
-                                                 ${Qt5DBus_INCLUDE_DIRS}
                                                  ../../interfaces)
 target_link_libraries(${PLUGIN_NAME} PRIVATE
     ${DtkWidget_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
+    Qt5::Widgets
-    ${Qt5Svg_LIBRARIES}
+    Qt5::DBus
-    ${Qt5DBus_LIBRARIES}
+    Qt5::Svg)
-)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)
 

plugins/pluginmanager/CMakeLists.txt

@@ -20,13 +20,12 @@ find_package(Qt5Widgets REQUIRED)
 find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
-pkg_check_modules(QGSettings REQUIRED gsettings-qt)
+
+pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
 
 add_library(${PLUGIN_NAME} SHARED ${SRCS})
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../loader/)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
-                                                 ${Qt5DBus_INCLUDE_DIRS}
-                                                 ${QGSettings_INCLUDE_DIRS}
                                                  ./pluginadapter
                                                  ../../frame/drag
                                                  ../../frame/dbusinterface
@@ -36,10 +35,9 @@ target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
     ${DtkWidget_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
+    PkgConfig::QGSettings
-    ${Qt5Svg_LIBRARIES}
+    Qt5::Widgets
-    ${Qt5DBus_LIBRARIES}
+    Qt5::DBus
-    ${QGSettings_LIBRARIES}
+    Qt5::Svg)
-)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/loader)

plugins/power/CMakeLists.txt

@@ -19,24 +19,21 @@ find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
-pkg_check_modules(QGSettings REQUIRED gsettings-qt)
+pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} power.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../quick-trays)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
-                                                 ${Qt5DBus_INCLUDE_DIRS}
-                                                 ${QGSettings_INCLUDE_DIRS}
                                                  ../../interfaces
                                                  ../../frame/qtdbusextended
                                                  ./dbusinterface/generation_dbus_interface)
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
     ${DtkWidget_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
+    PkgConfig::QGSettings
-    ${Qt5Svg_LIBRARIES}
+    Qt5::Widgets
-    ${Qt5DBus_LIBRARIES}
+    Qt5::DBus
-    ${QGSettings_LIBRARIES}
+    Qt5::Svg)
-)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/quick-trays)

plugins/show-desktop/CMakeLists.txt

@@ -13,15 +13,17 @@ find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
+pkg_check_modules(XCB_LIBS REQUIRED IMPORTED_TARGET xcursor)
+
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS})
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} ../../interfaces)
 target_link_libraries(${PLUGIN_NAME} PRIVATE
-    ${Qt5DBus_LIBRARIES}
     ${DtkWidget_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
+    PkgConfig::XCB_LIBS
-    ${Qt5Svg_LIBRARIES}
+    Qt5::Widgets
-)
+    Qt5::DBus
+    Qt5::Svg)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/shutdown/CMakeLists.txt

@@ -4,8 +4,7 @@ set(PLUGIN_NAME "shutdown")
 project(${PLUGIN_NAME})
 
 # Sources files
-file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/tipswidget.h" "../../widgets/tipswidget.cpp"
+file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/tipswidget.h" "../../widgets/tipswidget.cpp")
-"../../frame/util/imageutil.h" "../../frame/util/imageutil.cpp")
 
 find_package(PkgConfig REQUIRED)
 find_package(Qt5Widgets REQUIRED)
@@ -16,22 +15,19 @@ find_package(DtkWidget REQUIRED)
 #if (${CMAKE_SYSTEM_PROCESSOR}  STREQUAL "aarch64")
 #    add_definitions("-DDISABLE_POWER_OPTIONS")
 #endif()
-pkg_check_modules(QGSettings REQUIRED gsettings-qt)
+pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} shutdown.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
-                                                 ${Qt5DBus_INCLUDE_DIRS}
-                                                 ${QGSettings_INCLUDE_DIRS}
                                                  ../../interfaces
                                                  ../../widgets)
 target_link_libraries(${PLUGIN_NAME} PRIVATE
     ${DtkWidget_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
+    PkgConfig::QGSettings
-    ${Qt5Svg_LIBRARIES}
+    Qt5::Widgets
-    ${Qt5DBus_LIBRARIES}
+    Qt5::DBus
-    ${QGSettings_LIBRARIES}
+    Qt5::Svg)
-)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/sound/CMakeLists.txt

@@ -23,14 +23,13 @@ find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
-pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11 xcursor)
+pkg_check_modules(XCB_LIBS REQUIRED IMPORTED_TARGET xcursor)
-pkg_check_modules(QGSettings REQUIRED gsettings-qt)
+pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} resources/sound.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../quick-trays)
 target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
-    ${QGSettings_INCLUDE_DIRS}
     ./dbusinterface
     ./dbusinterface/generation_dbus_interface
     ../../interfaces
@@ -42,11 +41,10 @@ target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
     ${DtkWidget_LIBRARIES}
-    ${XCB_EWMH_LIBRARIES}
+    PkgConfig::QGSettings
-    ${QGSettings_LIBRARIES}
+    PkgConfig::XCB_LIBS
-    ${Qt5DBus_LIBRARIES}
+    Qt5::Widgets
-    ${Qt5Widgets_LIBRARIES}
+    Qt5::DBus
-    ${Qt5Svg_LIBRARIES}
+    Qt5::Svg)
-    )
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/quick-trays)

plugins/sound/sounditem.cpp

@@ -140,7 +140,8 @@ void SoundItem::resizeEvent(QResizeEvent *e)
 
 void SoundItem::wheelEvent(QWheelEvent *e)
 {
-    QWheelEvent *event = new QWheelEvent(e->position(), e->angleDelta().y(), e->buttons(), e->modifiers());
+    QWheelEvent *event = new QWheelEvent(e->position(), e->globalPosition(), e->pixelDelta(), e->angleDelta(),
+                                            e->buttons(), e->modifiers(), e->phase(), e->inverted());
     qApp->postEvent(m_applet->mainSlider(), event);
 
     e->accept();

plugins/trash/CMakeLists.txt

@@ -21,6 +21,8 @@ find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
+pkg_check_modules(XCB_LIBS REQUIRED IMPORTED_TARGET xcursor)
+
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} resource.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
@@ -33,9 +35,9 @@ target_include_directories(${PLUGIN_NAME} PUBLIC
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
     ${DtkWidget_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
+    PkgConfig::XCB_LIBS
-    ${Qt5DBus_LIBRARIES}
+    Qt5::Widgets
-    ${Qt5Svg_LIBRARIES}
+    Qt5::DBus
-)
+    Qt5::Svg)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/tray/CMakeLists.txt

@@ -56,11 +56,6 @@ add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} tray.qrc)
 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}
-                                                 ${QGSettings_INCLUDE_DIRS}
-                                                 ${dbusmenu-qt5_INCLUDE_DIRS}
                                                  ../../interfaces
                                                  ../../frame
                                                  ../../frame/qtdbusextended
@@ -69,14 +64,13 @@ target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
 
 target_link_libraries(${PLUGIN_NAME} PRIVATE
     ${DtkWidget_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
+    PkgConfig::QGSettings
-    ${Qt5X11Extras_LIBRARIES}
+    PkgConfig::XCB_LIBS
-    ${Qt5DBus_LIBRARIES}
+    Qt5::Concurrent
-    ${Qt5Svg_LIBRARIES}
+    Qt5::X11Extras
-    ${Qt5Concurrent_LIBRARIES}
+    Qt5::Widgets
-    ${XCB_LIBS_LIBRARIES}
+    Qt5::DBus
-    ${QGSettings_LIBRARIES}
+    Qt5::Svg
-    pthread
+    pthread)
-)
 
 install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/tray/indicatortraywidget.cpp

@@ -25,8 +25,8 @@ IndicatorTrayWidget::IndicatorTrayWidget(const QString &indicatorName, QWidget *
     m_label = new QLabel(this);
 
     QPalette p = m_label->palette();
-    p.setColor(QPalette::Foreground, Qt::white);
+    p.setColor(QPalette::WindowText, Qt::white);
-    p.setColor(QPalette::Background, Qt::transparent);
+    p.setColor(QPalette::Window, Qt::transparent);
     m_label->setPalette(p);
 
     m_label->setAttribute(Qt::WA_TranslucentBackground);
@@ -77,13 +77,13 @@ void IndicatorTrayWidget::enableLabel(bool enable)
     QPalette p = m_label->palette();
     if (!enable) {
         m_enableClick = false;
-        p.setColor(QPalette::Disabled, QPalette::Foreground, Qt::lightGray);
+        p.setColor(QPalette::Disabled, QPalette::WindowText, Qt::lightGray);
-        p.setColor(QPalette::Disabled, QPalette::Background, Qt::transparent);
+        p.setColor(QPalette::Disabled, QPalette::Window, Qt::transparent);
         m_label->setEnabled(enable);
     } else {
         m_enableClick = true;
         p.setColor(QPalette::Normal, QPalette::BrightText, Qt::white);
-        p.setColor(QPalette::Normal, QPalette::Background, Qt::transparent);
+        p.setColor(QPalette::Normal, QPalette::Window, Qt::transparent);
         m_label->setEnabled(enable);
     }