Fan PengCheng 943f66c1fc Merge branch 'maintain/5.2' into master ...

Change-Id: I9ee5876b424d2100d4a3589aebecb52918a0eb3c

# Conflicts:
#	frame/util/multiscreenworker.cpp
#	frame/util/multiscreenworker.h

2021-04-25 09:49:39 +08:00

..

resources/icons

fix file permission wrong

2017-11-20 10:43:02 +08:00

CMakeLists.txt

fix: Merge branch 'maintain/5.1' into uos

2020-09-11 17:55:36 +08:00

datetime.json

fix: 时间日期格式问题

2020-12-24 15:22:35 +08:00

datetime.qrc

remove clang depend

2018-08-08 14:37:20 +08:00

datetimeplugin.cpp

feat: 任务栏插件显示大小新增支持自定义宽度(或高度)

2020-11-09 15:19:21 +08:00

datetimeplugin.h

feat: 任务栏插件显示大小新增支持自定义宽度(或高度)

2020-11-09 15:19:21 +08:00

datetimewidget.cpp

Merge branch 'maintain/5.2' into master

2021-04-25 09:49:39 +08:00

datetimewidget.h

feat: 更改任务栏界面的时间显示格式

2020-07-30 18:03:18 +08:00