From 0bfd5f5543fb26e0ff8ae9d9ce83684d888272f1 Mon Sep 17 00:00:00 2001 From: ssk-wh Date: Fri, 30 Dec 2022 10:21:20 +0800 Subject: [PATCH] chore: 修复编译失败问题 DRegionMonitor从dtk的widget移动到了gui模块,但为了兼容,widget模块中还存在,要避免项目同时加载了两个模块中的DRegionMonitor类 Log: 编译问题 Influence: 编译问题 Change-Id: I8bd5d7350f6bda3d21b32685d086c79e3781b766 --- frame/util/dockpopupwindow.h | 3 +-- tests/util/ut_dockpopupwindow.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frame/util/dockpopupwindow.h b/frame/util/dockpopupwindow.h index 8d891c1..cf178cb 100644 --- a/frame/util/dockpopupwindow.h +++ b/frame/util/dockpopupwindow.h @@ -7,8 +7,7 @@ #include -#include +#include #include -DWIDGET_USE_NAMESPACE DGUI_USE_NAMESPACE diff --git a/tests/util/ut_dockpopupwindow.cpp b/tests/util/ut_dockpopupwindow.cpp index 1e6d3b4..4f75160 100644 --- a/tests/util/ut_dockpopupwindow.cpp +++ b/tests/util/ut_dockpopupwindow.cpp @@ -14,5 +14,5 @@ #include -DWIDGET_USE_NAMESPACE +DGUI_USE_NAMESPACE class Test_DockPopupWindow : public QObject, public ::testing::Test -- libgit2 1.3.2