Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-kwin for openSUSE:Factory
checked in at 2021-08-16 10:09:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-kwin (Old)
and /work/SRC/openSUSE:Factory/.deepin-kwin.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-kwin"
Mon Aug 16 10:09:18 2021 rev:3 rq:910913 version:5.3.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-kwin/deepin-kwin.changes 2021-06-02
22:10:58.656125342 +0200
+++ /work/SRC/openSUSE:Factory/.deepin-kwin.new.1899/deepin-kwin.changes
2021-08-16 10:14:21.198897533 +0200
@@ -1,0 +2,8 @@
+Tue Jun 15 04:07:03 UTC 2021 - Hillwood Yang <hillw...@opensuse.org>
+
+- Update version to 5.3.9
+ * Fix bugs
+ * Support kwin 5.21+, drop support-kwin-5_21+.patch
+- Drop fix-crash-bug.patch, fixed by upstream
+
+-------------------------------------------------------------------
Old:
----
dde-kwin-5.3.7.tar.gz
fix-crash-bug.patch
support-kwin-5_21+.patch
New:
----
dde-kwin-5.3.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-kwin.spec ++++++
--- /var/tmp/diff_new_pack.NQua2G/_old 2021-08-16 10:14:21.658896945 +0200
+++ /var/tmp/diff_new_pack.NQua2G/_new 2021-08-16 10:14:21.662896941 +0200
@@ -20,7 +20,7 @@
%define sover 0
Name: deepin-kwin
-Version: 5.3.7
+Version: 5.3.9
Release: 0
Summary: KWin configures/plugins on the DDE
License: GPL-3.0-or-later
@@ -31,12 +31,8 @@
# Patch1: deepin-kwin-unload-blur.patch
Patch0: deepin-kwin-tabbox-chameleon-rename.patch
%if 0%{suse_version} > 1500
-Patch2: deepin-kwin-crash.patch
-# Patch4: support-kwin-5_19+.patch
-Patch5: support-kwin-5_21+.patch
+Patch1: deepin-kwin-crash.patch
BuildRequires: cmake(KWaylandServer)
-%else
-Patch3: fix-crash-bug.patch
%endif
BuildRequires: fdupes
BuildRequires: gtest
++++++ dde-kwin-5.3.7.tar.gz -> dde-kwin-5.3.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-kwin-5.3.7/CMakeLists.txt
new/dde-kwin-5.3.9/CMakeLists.txt
--- old/dde-kwin-5.3.7/CMakeLists.txt 2021-03-17 10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/CMakeLists.txt 2021-04-21 12:15:25.000000000 +0200
@@ -84,3 +84,4 @@
add_subdirectory(scripts)
add_subdirectory(deepin-wm-dbus)
add_subdirectory(tabbox)
+add_subdirectory(tests)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-kwin-5.3.7/debian/changelog
new/dde-kwin-5.3.9/debian/changelog
--- old/dde-kwin-5.3.7/debian/changelog 2021-03-17 10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/debian/changelog 2021-04-21 12:15:25.000000000 +0200
@@ -1,3 +1,18 @@
+dde-kwin (5.3.9-1) UNRELEASED; urgency=medium
+
+ * Bug fix:
+ + 70513, 69821 fix: The community version of the multi tasking view is
full of icons.
+ + 49208, 72368 fix: Add RPM package detection server script.
+
+ -- Lei Su <su...@uniontech.com> Wed, 21 Apr 2021 18:09:00 +0800
+
+dde-kwin (5.3.8-1) UNRELEASED; urgency=medium
+
+ * Bug fix:
+ + 60642 fix: Click "X" with fingers to turn off insensitivity.
+
+ -- Lei Su <su...@uniontech.com> Fri, 02 Apr 2021 17:11:55 +0800
+
dde-kwin (5.3.7-1.1) unstable; urgency=medium
* Bug fix:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-kwin-5.3.7/debian/rules
new/dde-kwin-5.3.9/debian/rules
--- old/dde-kwin-5.3.7/debian/rules 2021-03-17 10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/debian/rules 2021-04-21 12:15:25.000000000 +0200
@@ -8,3 +8,5 @@
override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+override_dh_auto_test:
+ :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-kwin-5.3.7/plugins/kwineffects/blur/blur.cpp
new/dde-kwin-5.3.9/plugins/kwineffects/blur/blur.cpp
--- old/dde-kwin-5.3.7/plugins/kwineffects/blur/blur.cpp 2021-03-17
10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/plugins/kwineffects/blur/blur.cpp 2021-04-21
12:15:25.000000000 +0200
@@ -21,7 +21,6 @@
#include "blur.h"
#include "blurshader.h"
-#include "kwinutils.h"
#include <QGuiApplication>
#include <QMatrix4x4>
@@ -59,9 +58,11 @@
net_wm_blur_region = effects->announceSupportProperty(s_blurAtomName,
this);
KWaylandServer::Display *display = effects->waylandDisplay();
if (display) {
- m_blurManager = display->createBlurManager(this);
#if defined(KWIN_VERSION) && KWIN_VERSION <= KWIN_VERSION_CHECK(5, 18, 90, 0)
+ m_blurManager = display->createBlurManager(this);
m_blurManager->create();
+#else
+ m_blurManager = new KWaylandServer::BlurManagerInterface(display,
this);
#endif
}
} else {
@@ -509,7 +510,7 @@
vbo->setAttribLayout(layout, 2, sizeof(QVector2D));
}
-void BlurEffect::prePaintScreen(ScreenPrePaintData &data, int time)
+void BlurEffect::prePaintScreen(ScreenPrePaintData &data, TimeArgType time)
{
m_damagedArea = QRegion();
m_paintedArea = QRegion();
@@ -518,7 +519,7 @@
effects->prePaintScreen(data, time);
}
-void BlurEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int
time)
+void BlurEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data,
TimeArgType time)
{
// this effect relies on prePaintWindow being called in the bottom to top
order
@@ -899,4 +900,3 @@
m_shader->unbind();
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-kwin-5.3.7/plugins/kwineffects/blur/blur.h
new/dde-kwin-5.3.9/plugins/kwineffects/blur/blur.h
--- old/dde-kwin-5.3.7/plugins/kwineffects/blur/blur.h 2021-03-17
10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/plugins/kwineffects/blur/blur.h 2021-04-21
12:15:25.000000000 +0200
@@ -21,6 +21,8 @@
#ifndef BLUR_H
#define BLUR_H
+#include "kwinutils.h"
+
#include <kwineffects.h>
#include <kwinglplatform.h>
#include <kwinglutils.h>
@@ -63,8 +65,8 @@
static bool enabledByDefault();
void reconfigure(ReconfigureFlags flags) override;
- void prePaintScreen(ScreenPrePaintData &data, int time) override;
- void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time)
override;
+ void prePaintScreen(ScreenPrePaintData &data, TimeArgType time) override;
+ void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, TimeArgType
time) override;
void paintWindow(EffectWindow *w, int mask, QRegion region,
WindowPaintData &data) override;
#if KWIN_VERSION_MIN > 17 || (KWIN_VERSION_MIN == 17 && KWIN_VERSION_PAT > 5)
void paintEffectFrame(EffectFrame *frame, const QRegion ®ion, double
opacity, double frameOpacity) override;
@@ -156,4 +158,3 @@
}
#endif
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/CMakeLists.txt
new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/CMakeLists.txt
--- old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/CMakeLists.txt
2021-03-17 10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/CMakeLists.txt
2021-04-21 12:15:25.000000000 +0200
@@ -94,6 +94,8 @@
data.qrc
)
+include_directories(../../platforms/lib)
+
target_link_libraries(
${PLUGIN_NAME}
PUBLIC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/multitasking.cpp
new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/multitasking.cpp
--- old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/multitasking.cpp
2021-03-17 10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/multitasking.cpp
2021-04-21 12:15:25.000000000 +0200
@@ -561,7 +561,7 @@
}
// Screen painting
-void MultitaskingEffect::prePaintScreen(ScreenPrePaintData &data, int time)
+void MultitaskingEffect::prePaintScreen(ScreenPrePaintData &data, TimeArgType
time)
{
//EffectWindow of m_multitaskingView changes every time when
//multitaskingView show, we need to set EffectWindow before paintwindow
@@ -595,7 +595,7 @@
// Window painting
-void MultitaskingEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData
&data, int time)
+void MultitaskingEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData
&data, TimeArgType time)
{
if (m_multitaskingView && multitaskingViewEffectWindow()
&& w == multitaskingViewEffectWindow()) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/multitasking.h
new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/multitasking.h
--- old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/multitasking.h
2021-03-17 10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/multitasking.h
2021-04-21 12:15:25.000000000 +0200
@@ -35,6 +35,7 @@
#include <kwineffects.h>
#include <KF5/KWindowSystem/KWindowSystem>
+#include "kwinutils.h"
#include "background.h"
#include "constants.h"
@@ -255,7 +256,7 @@
virtual void reconfigure(ReconfigureFlags) override;
// Screen painting
- virtual void prePaintScreen(ScreenPrePaintData &data, int time) override;
+ virtual void prePaintScreen(ScreenPrePaintData &data, TimeArgType time)
override;
#if KWIN_VERSION_MIN > 17 || (KWIN_VERSION_MIN == 17 && KWIN_VERSION_PAT > 5)
virtual void paintScreen(int mask, const QRegion ®ion, ScreenPaintData
&data) override;
#else
@@ -264,7 +265,7 @@
virtual void postPaintScreen() override;
// Window painting
- virtual void prePaintWindow(EffectWindow *w, WindowPrePaintData &data, int
time) override;
+ virtual void prePaintWindow(EffectWindow *w, WindowPrePaintData &data,
TimeArgType time) override;
virtual void paintWindow(EffectWindow *w, int mask, QRegion region,
WindowPaintData &data) override;
// User interaction
@@ -325,7 +326,7 @@
void updateDesktopWindows();
void updateDesktopWindows(int desktop);
- // added when refactor
+ // added when refactor
void refreshWindows();
private slots:
@@ -340,9 +341,9 @@
void remanageAll();
void desktopRemoved(int d);
- //zhd add start
+ //zhd add start
void OnWindowLocateChanged(int screen, int desktop, int winId);
- //zhd add end
+ //zhd add end
void windowSelectSlot( QVariant winid );
void removeEffectWindow(int screen, int desktop, QVariant winid);
@@ -468,4 +469,3 @@
#endif /* ifndef _DEEPIN_MULTITASKING_H */
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/multitasking_model.h
new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/multitasking_model.h
--- old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/multitasking_model.h
2021-03-17 10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/multitasking_model.h
2021-04-21 12:15:25.000000000 +0200
@@ -66,8 +66,8 @@
Q_INVOKABLE int getWindowHeight(QVariant winId);
Q_INVOKABLE int getWindowWidth(QVariant winId);
- Q_INVOKABLE void addWindow(int screen, int desktop, const QVariant &winId);
- Q_INVOKABLE void removeWindow(int screen, int desktop, const QVariant
&winId);
+ Q_INVOKABLE void addWindow(int screen, int desktop, const QVariant
&winId){};
+ Q_INVOKABLE void removeWindow(int screen, int desktop, const QVariant
&winId){};
Q_INVOKABLE void setWindows(int screen, int desktop, const QVariantList
&windows);
Q_INVOKABLE QVariantList windows(int screen, int desktop) const;
Q_INVOKABLE bool isCurrentScreenWindows(int screen, int desktop, QVariant
wid);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/thumbmanager.qml
new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/thumbmanager.qml
--- old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/thumbmanager.qml
2021-03-17 10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/thumbmanager.qml
2021-04-21 12:15:25.000000000 +0200
@@ -191,6 +191,7 @@
model: multitaskingModel
interactive : false;
spacing: (screenWidth > screenHeight) ? screenWidth * 60/1920
: screenWidth * 110/1080
+ signal closeBtnHide()
delegate: Rectangle {
@@ -252,7 +253,6 @@
width: closeBtnIcon.width
height: closeBtnIcon.height
color: "transparent";
-
property int desktop: desktopThumbnail.desktop;
visible: false;
@@ -267,6 +267,10 @@
onCountChanged: {
closeBtn.visible = false;
}
+
+ onCloseBtnHide: {
+ closeBtn.visible = false;
+ }
}
MouseArea {
anchors.fill: parent;
@@ -293,6 +297,9 @@
id: desktopThumbMouseArea
anchors.fill: parent;
hoverEnabled: true;
+ property var mouseRecordX
+ property var mouseRecordY
+ property bool touchToExit : false
Accessible.role: Accessible.Button
Accessible.name:
"Ma_deskThumb_"+(index+1)+"_"+currentScreen
@@ -322,16 +329,28 @@
}
onEntered: {
+ view.closeBtnHide();
if (multitaskingModel.rowCount() !== 1) {
closeBtn.visible = true;
}
}
onExited: {
- if
(!closeBtn.contains(closeBtn.mapFromItem(desktopThumbMouseArea,mouseX,mouseY)))???{
- ???closeBtn.visible = false;
+ if
(!closeBtn.contains(closeBtn.mapFromItem(desktopThumbMouseArea,mouseX,mouseY))
&& touchToExit == false) {
+ ???closeBtn.visible = false
+ } else if (touchToExit == true) {
+ touchToExit = false
}
}
+
+ onPositionChanged: {
+ if (mouseRecordX === mouse.x && mouseRecordY
=== mouse.y) {
+ touchToExit = true;
//???????????????????????????
+ } else {
+ mouseRecordX = mouse.x
+ mouseRecordY = mouse.y
+ }
+ }
}
property bool pendingDragRemove: false
Drag.keys: ["workspaceThumb"];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/windowthumbnail.cpp
new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/windowthumbnail.cpp
--- old/dde-kwin-5.3.7/plugins/kwineffects/multitasking/windowthumbnail.cpp
2021-03-17 10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/plugins/kwineffects/multitasking/windowthumbnail.cpp
2021-04-21 12:15:25.000000000 +0200
@@ -865,7 +865,7 @@
bool WindowThumbnail::startRedirecting()
{
- if (!m_xcb || !m_composite || !window() || !window()->isVisible() ||
window()->winId() == m_winId || !isEnabled() || !isVisible()) {
+ if (!m_xcb || !m_composite || !window() || window()->winId() == m_winId) {
return false;
}
#if HAVE_XCB_COMPOSITE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-kwin-5.3.7/plugins/platforms/lib/kwinutils.h
new/dde-kwin-5.3.9/plugins/platforms/lib/kwinutils.h
--- old/dde-kwin-5.3.7/plugins/platforms/lib/kwinutils.h 2021-03-17
10:39:07.000000000 +0100
+++ new/dde-kwin-5.3.9/plugins/platforms/lib/kwinutils.h 2021-04-21
12:15:25.000000000 +0200
@@ -29,6 +29,12 @@
#define KWIN_VERSION KWIN_VERSION_CHECK(KWIN_VERSION_MAJ, KWIN_VERSION_MIN,
KWIN_VERSION_PAT, KWIN_VERSION_BUI)
#endif
+#if defined(KWIN_VERSION) && KWIN_VERSION < KWIN_VERSION_CHECK(5, 21, 3, 0)
+typedef int TimeArgType;
+#else
+typedef std::chrono::milliseconds TimeArgType;
+#endif
+
class KWinUtilsPrivate;
class Q_DECL_EXPORT KWinUtils : public QObject
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-kwin-5.3.7/rpm/dde-kwin.spec
new/dde-kwin-5.3.9/rpm/dde-kwin.spec
--- old/dde-kwin-5.3.7/rpm/dde-kwin.spec 2021-03-17 10:39:07.000000000
+0100
+++ new/dde-kwin-5.3.9/rpm/dde-kwin.spec 2021-04-21 12:15:25.000000000
+0200
@@ -8,7 +8,7 @@
%endif
Name: dde-kwin
-Version: 5.1.0.20
+Version: 5.3.8
Release: %{specrelease}
Summary: KWin configuration for Deepin Desktop Environment
License: GPLv3+
@@ -89,6 +89,11 @@
%install
%make_install INSTALL_ROOT=%{buildroot}
chmod 755 %{buildroot}%{_bindir}/kwin_no_scale
+install debian/dde-kwin.postinst %{buildroot}%{_datadir}/kwin/scripts/
+chmod 755 %{buildroot}%{_datadir}/kwin/scripts/dde-kwin.postinst
+
+%post
+bash -x %{_datadir}/kwin/scripts/dde-kwin.postinst
%ldconfig_scriptlets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-kwin-5.3.7/tests/CMakeLists.txt
new/dde-kwin-5.3.9/tests/CMakeLists.txt
--- old/dde-kwin-5.3.7/tests/CMakeLists.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/dde-kwin-5.3.9/tests/CMakeLists.txt 2021-04-21 12:15:25.000000000
+0200
@@ -0,0 +1,62 @@
+set(CMAKE_CXX_FLAGS "-g -fprofile-arcs -ftest-coverage")
+set(CMAKE_C_FLAGS "-g -fprofile-arcs -ftest-coverage")
+
+set(PROJECT_NAME_TEST
+ ${PROJECT_NAME}_test)
+
+find_package(Qt5Test REQUIRED)
+find_package(Qt5 CONFIG REQUIRED COMPONENTS Core Gui )
+#find_package(Qt5DBus REQUIRED)
+find_package(KF5CoreAddons REQUIRED)
+find_package(KF5WindowSystem REQUIRED)
+find_package(KF5Config REQUIRED)
+
+find_package(Qt5Quick REQUIRED)
+find_package(Qt5QuickWidgets REQUIRED)
+find_package(KF5GlobalAccel REQUIRED)
+find_package(KF5I18n REQUIRED)
+find_package(PkgConfig REQUIRED)
+find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt5X11Extras REQUIRED)
+
+pkg_search_module(QGSETTINGS REQUIRED IMPORTED_TARGET gsettings-qt)
+
+set( test
+ ut_mulitask_model.cpp
+ ../plugins/kwineffects/multitasking/multitasking_model.cpp
+)
+
+add_executable(${PROJECT_NAME_TEST} ${test})
+
+target_link_libraries(
+ ${PROJECT_NAME_TEST}
+ Qt5::Core
+ Qt5::Gui
+ Qt5::Widgets
+ Qt5::Quick
+ Qt5::QuickWidgets
+ Qt5::Test
+ Qt5::DBus
+ Qt5::X11Extras
+ KF5::ConfigCore
+ KF5::CoreAddons
+ KF5::WindowSystem
+ KF5::GlobalAccel
+ KF5::I18n
+ PkgConfig::QGSETTINGS
+ Qt5::X11Extras
+ xcb
+ kwineffects
+)
+
+include_directories(../plugins/platforms/lib)
+
+add_test(NAME dde-test COMMAND ${PROJECT_NAME_TEST})
+add_custom_target(test
+ COMMAND echo " =================== TEST BEGIN ==================== "
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMAND ${CMAKE_BINARY_DIR}/tests/${PROJECT_NAME_TEST}
+ COMMAND echo " =================== TEST END ==================== "
+)
+
+add_dependencies(test ${PROJECT_NAME_TEST})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-kwin-5.3.7/tests/cmake-lcov-test.sh
new/dde-kwin-5.3.9/tests/cmake-lcov-test.sh
--- old/dde-kwin-5.3.7/tests/cmake-lcov-test.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/dde-kwin-5.3.9/tests/cmake-lcov-test.sh 2021-04-21 12:15:25.000000000
+0200
@@ -0,0 +1,35 @@
+#!/bin/bash
+workspace=$1
+
+cd $workspace
+
+export DISPLAY=:0.0
+
+dpkg-buildpackage -b -d -uc -us
+
+project_path=$(cd `dirname $0`; pwd)
+#???????????????
+project_name="${project_path##*/}"
+echo $project_name
+
+#?????????????????????????????????
+pathname=$(find . -name obj*)
+
+echo $pathname
+
+cd $pathname
+
+make test
+
+cd ./tests
+
+mkdir -p coverage
+
+lcov -d ../ -c -o ./coverage/coverage.info
+
+lcov --remove ./coverage/coverage.info '*/tests/*' '*/autotests/*' -o
./coverage/coverage.info
+
+mkdir ../report
+genhtml -o ../report ./coverage/coverage.info
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-kwin-5.3.7/tests/mockkwinutils.h
new/dde-kwin-5.3.9/tests/mockkwinutils.h
--- old/dde-kwin-5.3.7/tests/mockkwinutils.h 1970-01-01 01:00:00.000000000
+0100
+++ new/dde-kwin-5.3.9/tests/mockkwinutils.h 2021-04-21 12:15:25.000000000
+0200
@@ -0,0 +1,4 @@
+#ifndef MOCKKWINUTILS_H
+#define MOCKKWINUTILS_H
+
+#endif // MOCKKWINUTILS_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dde-kwin-5.3.7/tests/ut_mulitask_model.cpp
new/dde-kwin-5.3.9/tests/ut_mulitask_model.cpp
--- old/dde-kwin-5.3.7/tests/ut_mulitask_model.cpp 1970-01-01
01:00:00.000000000 +0100
+++ new/dde-kwin-5.3.9/tests/ut_mulitask_model.cpp 2021-04-21
12:15:25.000000000 +0200
@@ -0,0 +1,40 @@
+/********************************************************************
+KWin - the KDE window manager
+This file is part of the KDE project.
+
+Copyright (C) 2012 Martin Gr????lin <mgraess...@kde.org>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*********************************************************************/
+
+
+#include <QObject>
+#include <QtTest>
+#include "../plugins/kwineffects/multitasking/multitasking_model.h"
+
+class ut_test : public QObject
+{
+ Q_OBJECT
+private Q_SLOTS:
+ void test();
+};
+
+void ut_test::test()
+{
+ MultitaskingModel model;
+ model.load(1);
+}
+
+QTEST_MAIN(ut_test)
+#include "ut_mulitask_model.moc"
