Skip to content

Commit c8251d0

Browse files
wjyrichdeepin-bot[bot]
authored andcommitted
Revert "refactor: move dockiteminfo to shared frame library"
This reverts commit 154a3a2.
1 parent 1bdec03 commit c8251d0

9 files changed

Lines changed: 17 additions & 11 deletions

File tree

frame/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ set(PUBLIC_HEADERS
1717
layershell/dlayershellwindow.h
1818
models/listtotableproxymodel.h
1919
dsutility.h
20-
dockiteminfo.h
2120
)
2221

2322
set(PRIVATE_HEADERS
@@ -64,7 +63,6 @@ add_library(dde-shell-frame SHARED
6463
qmlengine.cpp
6564
appletitemmodel.h
6665
appletitemmodel.cpp
67-
dockiteminfo.cpp
6866
dsqmlglobal.cpp
6967
layershell/dlayershellwindow.cpp
7068
layershell/qwaylandlayershellsurface.cpp

panels/dock/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
1+
# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
22
#
33
# SPDX-License-Identifier: GPL-3.0-or-later
44

@@ -18,6 +18,8 @@ file(
1818
dockabstractsettingsconfig.h
1919
dockdbusproxy.cpp
2020
dockdbusproxy.h
21+
dockiteminfo.cpp
22+
dockiteminfo.h
2123
dockpanel.cpp
2224
dockpanel.h
2325
docksettings.cpp

panels/dock/appruntimeitem/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
1+
# SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
22
#
33
# SPDX-License-Identifier: GPL-3.0-or-later
44

@@ -13,6 +13,8 @@ add_library(dock-appruntimeitem SHARED
1313
xcbgetinfo.h
1414
xcbgetinfo.cpp
1515
qmlappruntime.qrc
16+
${CMAKE_SOURCE_DIR}/panels/dock/dockiteminfo.cpp
17+
${CMAKE_SOURCE_DIR}/panels/dock/dockiteminfo.h
1618
${CMAKE_SOURCE_DIR}/panels/dock/constants.h
1719
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/x11utils.h
1820
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/x11utils.cpp
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
1+
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
22
//
33
// SPDX-License-Identifier: GPL-3.0-or-later
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
1+
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
22
//
33
// SPDX-License-Identifier: GPL-3.0-or-later
44
#pragma once

panels/dock/multitaskview/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
1+
# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
22
#
33
# SPDX-License-Identifier: GPL-3.0-or-later
44

@@ -12,6 +12,8 @@ add_library(dock-multitaskview SHARED
1212
multitaskview.h
1313
treelandmultitaskview.cpp
1414
treelandmultitaskview.h
15+
../dockiteminfo.cpp
16+
../dockiteminfo.h
1517
)
1618

1719
target_include_directories(dock-multitaskview PRIVATE

panels/dock/multitaskview/multitaskview.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
1+
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
22
//
33
// SPDX-License-Identifier: GPL-3.0-or-later
44

55
#pragma once
66

7-
#include "dockiteminfo.h"
7+
#include "../dockiteminfo.h"
88
#include "applet.h"
99
#include "dsglobal.h"
1010
#include "treelandmultitaskview.h"

panels/dock/tray/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
1+
# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
22
#
33
# SPDX-License-Identifier: CC0-1.0
44

@@ -42,6 +42,8 @@ add_library(trayitem SHARED
4242
trayitem.h
4343
traysettings.cpp
4444
traysettings.h
45+
../dockiteminfo.cpp
46+
../dockiteminfo.h
4547
../constants.h
4648
)
4749

panels/dock/tray/trayitem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
1+
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
22
//
33
// SPDX-License-Identifier: GPL-3.0-or-later
44

0 commit comments

Comments
 (0)