From f20569bf1ba7544df9e5098017cda45a48e2c45d Mon Sep 17 00:00:00 2001 From: donghualin Date: Wed, 20 Oct 2021 17:25:03 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=8F=E5=86=85=E5=AD=98=E6=B3=84=E9=9C=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复任务栏内存泄露，不影响功能 Log: 修复任务栏内存泄露 Influence: 任务栏 Task: https://pms.uniontech.com/zentao/task-view-88885.html Change-Id: I976a9f1cacf1f583abb61ad9de0384aa45cd889a --- frame/window/mainpanelcontrol.cpp | 2 +- tests/item/components/ut_appdragwidget.cpp | 1 + tests/item/components/ut_appsnapshot.cpp | 2 ++ tests/item/components/ut_previewcontainer.cpp | 1 + tests/item/ut_appitem.cpp | 2 ++ tests/item/ut_dockitem.cpp | 5 ++++- tests/item/ut_launcheritem.cpp | 1 + tests/window/ut_mainpanelcontrol.cpp | 2 ++ tests/window/ut_mainwindow.cpp | 1 + 9 files changed, 15 insertions(+), 2 deletions(-) diff --git a/frame/window/mainpanelcontrol.cpp b/frame/window/mainpanelcontrol.cpp index 63d63617c..24a834111 100755 --- a/frame/window/mainpanelcontrol.cpp +++ b/frame/window/mainpanelcontrol.cpp @@ -246,7 +246,7 @@ void MainPanelControl::addPluginAreaItem(int index, QWidget *wdg) { //因为日期时间插件和其他插件的大小有异，为了方便设置边距，在插件区域布局再添加一层布局设置边距 //因此在处理插件图标时，需要通过两层布局判断是否为需要的插件，例如拖动插件位置等判断 - QBoxLayout * boxLayout = new QBoxLayout(QBoxLayout::LeftToRight); + QBoxLayout * boxLayout = new QBoxLayout(QBoxLayout::LeftToRight, this); boxLayout->addWidget(wdg, 0, Qt::AlignCenter); m_pluginLayout->insertLayout(index, boxLayout, 0); diff --git a/tests/item/components/ut_appdragwidget.cpp b/tests/item/components/ut_appdragwidget.cpp index 5c38ebffc..33add570f 100644 --- a/tests/item/components/ut_appdragwidget.cpp +++ b/tests/item/components/ut_appdragwidget.cpp @@ -124,5 +124,6 @@ TEST_F(Test_AppDragWidget, event_test) QEvent enterEvent_(QEvent::Enter); dragWidget.enterEvent(&enterEvent_); + data->deleteLater(); ASSERT_TRUE(true); } diff --git a/tests/item/components/ut_appsnapshot.cpp b/tests/item/components/ut_appsnapshot.cpp index abbe49e5e..850d38925 100644 --- a/tests/item/components/ut_appsnapshot.cpp +++ b/tests/item/components/ut_appsnapshot.cpp @@ -103,6 +103,8 @@ TEST_F(Test_AppSnapshot, event_test) QDragMoveEvent event10(QPoint(), Qt::DropAction::CopyAction, data, Qt::LeftButton, Qt::NoModifier); snapShot.dragMoveEvent(&event10); + + data->deleteLater(); } TEST_F(Test_AppSnapshot, setWindowState) diff --git a/tests/item/components/ut_previewcontainer.cpp b/tests/item/components/ut_previewcontainer.cpp index bf9452841..cb9d48f0a 100644 --- a/tests/item/components/ut_previewcontainer.cpp +++ b/tests/item/components/ut_previewcontainer.cpp @@ -147,6 +147,7 @@ TEST_F(Test_PreviewContainer, event_test) container->dragMoveEvent(&event10); delete container; + data->deleteLater(); ASSERT_TRUE(true); } diff --git a/tests/item/ut_appitem.cpp b/tests/item/ut_appitem.cpp index de74f2560..4c176d64a 100644 --- a/tests/item/ut_appitem.cpp +++ b/tests/item/ut_appitem.cpp @@ -178,6 +178,8 @@ TEST_F(Test_AppItem, event_test) QDragMoveEvent event10(QPoint(), Qt::DropAction::CopyAction, data, Qt::LeftButton, Qt::NoModifier); appItem->dragMoveEvent(&event10); + + data->deleteLater(); } TEST_F(Test_AppItem, checkEntry) diff --git a/tests/item/ut_dockitem.cpp b/tests/item/ut_dockitem.cpp index 58b817419..a47a72ffb 100644 --- a/tests/item/ut_dockitem.cpp +++ b/tests/item/ut_dockitem.cpp @@ -115,7 +115,8 @@ TEST_F(Test_DockItem, event_test) QEvent e(QEvent::Enter); item->enterEvent(&e); - item->menuActionClicked(new QAction()); + QAction *action = new QAction(); + item->menuActionClicked(action); item->onContextMenuAccepted(); @@ -123,6 +124,8 @@ TEST_F(Test_DockItem, event_test) QEvent *deleteEvent = new QEvent(QEvent::DeferredDelete); qApp->postEvent(item, deleteEvent); + deleteEvent = new QEvent(QEvent::DeferredDelete); + qApp->postEvent(action, deleteEvent); item->showContextMenu(); } diff --git a/tests/item/ut_launcheritem.cpp b/tests/item/ut_launcheritem.cpp index faa7a3671..91b7dd701 100644 --- a/tests/item/ut_launcheritem.cpp +++ b/tests/item/ut_launcheritem.cpp @@ -81,6 +81,7 @@ TEST_F(Test_LauncherItem, event_test) QDragMoveEvent event10(QPoint(), Qt::DropAction::CopyAction, data, Qt::LeftButton, Qt::NoModifier); launcherItem->dragMoveEvent(&event10); + data->deleteLater(); delete launcherItem; } diff --git a/tests/window/ut_mainpanelcontrol.cpp b/tests/window/ut_mainpanelcontrol.cpp index 19974cab9..aa60a6cd2 100644 --- a/tests/window/ut_mainpanelcontrol.cpp +++ b/tests/window/ut_mainpanelcontrol.cpp @@ -274,6 +274,8 @@ TEST_F(Test_MainPanelControl, event_test) QDragMoveEvent event10(QPoint(), Qt::DropAction::CopyAction, data, Qt::LeftButton, Qt::NoModifier); panel.dragMoveEvent(&event10); + + data->deleteLater(); } TEST_F(Test_MainPanelControl, dragLeaveEvent) diff --git a/tests/window/ut_mainwindow.cpp b/tests/window/ut_mainwindow.cpp index 1d3ec646f..b6d55fcad 100644 --- a/tests/window/ut_mainwindow.cpp +++ b/tests/window/ut_mainwindow.cpp @@ -130,6 +130,7 @@ TEST_F(Test_MainWindow, event_test) QEnterEvent event12(QPointF(0.0, 0.0), QPointF(0.0, 0.0), QPointF(0.0, 0.0)); window->enterEvent(&event12); + data->deleteLater(); delete window; }