mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-04 17:33:05 +00:00
feat: 删除对dde-control-center-dev包的引用
删除项目中对dde-control-center-dev包的引用和其他相关的内容 Log: 删除对dde-control-center-dev包的引用 Influence: 无 Task: https://pms.uniontech.com/task-view-114411.html Change-Id: I38323556c35fb5c5ec870207f6fceac082c13099
This commit is contained in:
parent
627422b0b6
commit
9d811ac826
1
debian/control
vendored
1
debian/control
vendored
@ -26,7 +26,6 @@ Build-Depends: debhelper (>= 8.0.0),
|
|||||||
libgtest-dev,
|
libgtest-dev,
|
||||||
libgmock-dev,
|
libgmock-dev,
|
||||||
qttools5-dev,
|
qttools5-dev,
|
||||||
dde-control-center-dev,
|
|
||||||
libxcursor-dev
|
libxcursor-dev
|
||||||
Standards-Version: 3.9.8
|
Standards-Version: 3.9.8
|
||||||
Homepage: http://www.deepin.org/
|
Homepage: http://www.deepin.org/
|
||||||
|
@ -11,5 +11,5 @@ add_subdirectory("overlay-warning")
|
|||||||
add_subdirectory("show-desktop")
|
add_subdirectory("show-desktop")
|
||||||
add_subdirectory("multitasking")
|
add_subdirectory("multitasking")
|
||||||
add_subdirectory("bluetooth")
|
add_subdirectory("bluetooth")
|
||||||
add_subdirectory("dcc-dock-plugin")
|
#add_subdirectory("dcc-dock-plugin")
|
||||||
add_subdirectory("airplane-mode")
|
add_subdirectory("airplane-mode")
|
||||||
|
@ -14,19 +14,22 @@ file(GLOB_RECURSE SRCS
|
|||||||
"../widgets/*.h"
|
"../widgets/*.h"
|
||||||
"../widgets/*.cpp")
|
"../widgets/*.cpp")
|
||||||
|
|
||||||
|
list(REMOVE_ITEM SRCS "plugins/dcc-dock-settings-plugin/*.cpp")
|
||||||
|
|
||||||
# Sources files
|
# Sources files
|
||||||
file(GLOB_RECURSE PLUGIN_SRCS
|
file(GLOB_RECURSE PLUGIN_SRCS
|
||||||
"../plugins/bluetooth/*.h"
|
"../plugins/bluetooth/*.h"
|
||||||
"../plugins/bluetooth/*.cpp"
|
"../plugins/bluetooth/*.cpp"
|
||||||
"../plugins/bluetooth/componments/*.h"
|
"../plugins/bluetooth/componments/*.h"
|
||||||
"../plugins/bluetooth/componments/*.cpp"
|
"../plugins/bluetooth/componments/*.cpp"
|
||||||
"../plugins/dcc-dock-plugin/*.h"
|
#"../plugins/dcc-dock-plugin/*.h"
|
||||||
"../plugins/dcc-dock-plugin/*.cpp"
|
#"../plugins/dcc-dock-plugin/*.cpp"
|
||||||
"../frame/util/horizontalseperator.h"
|
"../frame/util/horizontalseperator.h"
|
||||||
"../frame/util/horizontalseperator.cpp")
|
"../frame/util/horizontalseperator.cpp")
|
||||||
|
|
||||||
|
|
||||||
# 其包含的"interface/moduleinterface.h"文件中定义了ModuleInterface_iid,任务栏插件框架的interface文件中也有定义
|
# 其包含的"interface/moduleinterface.h"文件中定义了ModuleInterface_iid,任务栏插件框架的interface文件中也有定义
|
||||||
list(FILTER PLUGIN_SRCS EXCLUDE REGEX "../plugins/dcc-dock-plugin/settings_module.*")
|
#list(FILTER PLUGIN_SRCS EXCLUDE REGEX "../plugins/dcc-dock-plugin/settings_module.*")
|
||||||
|
|
||||||
# 用于测试覆盖率的编译条件
|
# 用于测试覆盖率的编译条件
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage -lgcov")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage -lgcov")
|
||||||
@ -48,7 +51,7 @@ find_package(Qt5DBus REQUIRED)
|
|||||||
find_package(DtkWidget REQUIRED)
|
find_package(DtkWidget REQUIRED)
|
||||||
find_package(Qt5Svg REQUIRED)
|
find_package(Qt5Svg REQUIRED)
|
||||||
find_package(Qt5 COMPONENTS Test REQUIRED)
|
find_package(Qt5 COMPONENTS Test REQUIRED)
|
||||||
find_package(DdeControlCenter REQUIRED)
|
#find_package(DdeControlCenter REQUIRED)
|
||||||
find_package(GTest REQUIRED)
|
find_package(GTest REQUIRED)
|
||||||
find_package(GMock REQUIRED)
|
find_package(GMock REQUIRED)
|
||||||
|
|
||||||
@ -72,12 +75,12 @@ target_include_directories(${BIN_NAME} PUBLIC
|
|||||||
${DFrameworkDBus_INCLUDE_DIRS}
|
${DFrameworkDBus_INCLUDE_DIRS}
|
||||||
${Qt5Gui_PRIVATE_INCLUDE_DIRS}
|
${Qt5Gui_PRIVATE_INCLUDE_DIRS}
|
||||||
${QGSettings_INCLUDE_DIRS}
|
${QGSettings_INCLUDE_DIRS}
|
||||||
${DdeControlCenter_INCLUDE_DIR}
|
#${DdeControlCenter_INCLUDE_DIR}
|
||||||
../interfaces
|
../interfaces
|
||||||
fakedbus
|
fakedbus
|
||||||
../plugins/bluetooth
|
../plugins/bluetooth
|
||||||
../plugins/bluetooth/componments
|
../plugins/bluetooth/componments
|
||||||
../plugins/dcc-dock-plugin
|
#../plugins/dcc-dock-plugin
|
||||||
)
|
)
|
||||||
|
|
||||||
# 链接库
|
# 链接库
|
||||||
@ -92,7 +95,7 @@ target_link_libraries(${BIN_NAME} PRIVATE
|
|||||||
${Qt5DBus_LIBRARIES}
|
${Qt5DBus_LIBRARIES}
|
||||||
${QGSettings_LIBRARIES}
|
${QGSettings_LIBRARIES}
|
||||||
${Qt5Svg_LIBRARIES}
|
${Qt5Svg_LIBRARIES}
|
||||||
${DdeControlCenter_LIBRARIES}
|
#${DdeControlCenter_LIBRARIES}
|
||||||
${GTEST_LIBRARIES}
|
${GTEST_LIBRARIES}
|
||||||
${GMOCK_LIBRARIES}
|
${GMOCK_LIBRARIES}
|
||||||
-lpthread
|
-lpthread
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
#include "config_watcher.h"
|
//#include "config_watcher.h"
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
|
|
||||||
using namespace dcc_dock_plugin;
|
//using namespace dcc_dock_plugin;
|
||||||
|
|
||||||
class Test_GSettingWatcher : public QObject, public ::testing::Test
|
class Test_GSettingWatcher : public QObject, public ::testing::Test
|
||||||
{};
|
{};
|
||||||
|
|
||||||
TEST_F(Test_GSettingWatcher, bind)
|
TEST_F(Test_GSettingWatcher, bind)
|
||||||
{
|
{
|
||||||
ConfigWatcher watcher("dde.dock.plugin.dconfig");
|
/* ConfigWatcher watcher("dde.dock.plugin.dconfig");
|
||||||
|
|
||||||
QWidget widget;
|
QWidget widget;
|
||||||
watcher.bind("Control-Center_Dock_Plugins", &widget);
|
watcher.bind("Control-Center_Dock_Plugins", &widget);
|
||||||
@ -19,24 +19,27 @@ TEST_F(Test_GSettingWatcher, bind)
|
|||||||
watcher.bind("invalid", &widget);
|
watcher.bind("invalid", &widget);
|
||||||
watcher.bind("", &widget);
|
watcher.bind("", &widget);
|
||||||
watcher.bind("", nullptr);
|
watcher.bind("", nullptr);
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(Test_GSettingWatcher, setStatus)
|
TEST_F(Test_GSettingWatcher, setStatus)
|
||||||
{
|
{
|
||||||
ConfigWatcher watcher("dde.dock.plugin.dconfig");
|
/* ConfigWatcher watcher("dde.dock.plugin.dconfig");
|
||||||
|
|
||||||
QWidget widget;
|
QWidget widget;
|
||||||
watcher.bind("Control-Center_Dock_Plugins", &widget);
|
watcher.bind("Control-Center_Dock_Plugins", &widget);
|
||||||
watcher.setStatus("Control-Center_Dock_Plugins", &widget);
|
watcher.setStatus("Control-Center_Dock_Plugins", &widget);
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(Test_GSettingWatcher, onStatusModeChanged)
|
TEST_F(Test_GSettingWatcher, onStatusModeChanged)
|
||||||
{
|
{
|
||||||
ConfigWatcher watcher("dde.dock.plugin.dconfig");
|
/* ConfigWatcher watcher("dde.dock.plugin.dconfig");
|
||||||
|
|
||||||
QWidget widget;
|
QWidget widget;
|
||||||
watcher.bind("Control-Center_Dock_Plugins", &widget);
|
watcher.bind("Control-Center_Dock_Plugins", &widget);
|
||||||
watcher.onStatusModeChanged("Control-Center_Dock_Plugins");
|
watcher.onStatusModeChanged("Control-Center_Dock_Plugins");
|
||||||
watcher.onStatusModeChanged("invalid");
|
watcher.onStatusModeChanged("invalid");
|
||||||
watcher.onStatusModeChanged("");
|
watcher.onStatusModeChanged("");
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "module_widget.h"
|
//#include "module_widget.h"
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
||||||
@ -9,7 +9,7 @@ class Test_ModuleWidget : public QObject, public ::testing::Test
|
|||||||
|
|
||||||
TEST_F(Test_ModuleWidget, updateSliderValue)
|
TEST_F(Test_ModuleWidget, updateSliderValue)
|
||||||
{
|
{
|
||||||
ModuleWidget widget;
|
//ModuleWidget widget;
|
||||||
|
|
||||||
widget.updateSliderValue();
|
//widget.updateSliderValue();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user