merge to master #80
Merged
merge to master #80
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sync by github workflow Log: none Influence: none
sync by github workflow Log: none Influence: none
Log: opencv 引入时使用 3rdparty/opencv-4.5.4/build/install/lib/libopencv_world.a，写死了 lib 路径，但是 CMAKE_INSTALL_LIBDIR 在一些 64 位系统中是 lib64
安装路径Prefix规范化 Log: 安装路径Prefix规范化
后端切换至dtkocr Log: 后端切换至dtkocr
更新翻译文件 Log: 更新翻译文件
add OBS workflows log:
修改changelog Log: 修改changelog
添加翻译配置文件 Log: 修复部分已知问题
sync by github workflow Log: none Influence: none
sync by github workflow Log: none Influence: none
Update changelog Log: Update changelog
Fix wrong combobox window palette Log: Fix wrong combobox window palette Bug: https://pms.uniontech.com/bug-view-241599.html
add transifex config Log: add transifex config Task: https://pms.uniontech.com/task-view-361363.html
Adapt Treeland, disable wayland settings in Treeland enviroment. Log: Adapt Treeland.
update version Log: update version
Fixed the Compact Mode issue Bug: https://pms.uniontech.com/bug-view-202377.html Log: Fixed the Compact Mode issue
rmove kwayland-shell Log: remove kwayland-shell
ui modify Bug: https://pms.uniontech.com/bug-view-280015.html Log: ui modify
显示修改 Bug: https://pms.uniontech.com/bug-view-280031.html Log: 显示修改
Optimized vulkan dependencies Log: Optimized vulkan dependencies
feat: 添加 DConfig 相关源代码。
On some device models, using GPU acceleration during the OCR process leads to crashes during destruction. Now, the os-config solution is employed to customize these machines. fix: 某些机型上，使用GPU加速导致崩溃 在某些机型上，OCR过程中使用GPU加速，析构时会导致崩溃。现在使用os-config方案对这些机器进行定制。
When performing the destruction operation, it is necessary to wait for the child thread to exit to avoid errors in resource release. fix: 关闭应用引起进程崩溃 析构操作时，需要等待子线程退出，避免资源释放出错。 Bug: https://pms.uniontech.com/bug-view-334545.html
|
TAG Bot TAG: 6.5.14 |
dengzhongyuan365-dev
force-pushed
the
master
branch
2 times, most recently
from
6813379 to
29b7d0a
Compare
Merge release/eagle into master, bringing in: - Treeland support and disabling wayland settings in Treeland - GPU acceleration crash fixes - DConfig backend and config integration - UI and translation fixes from release/eagle
- Added libdtk6ocr-dev as alternative to libdtkocr-dev in Debian build dependencies - Added utils directory to CMake include paths and source directories - Updated translation file line number references across all language files to reflect code changes Log: Update build dependencies and translation references
Sync local master with upstream/master: - Pick up upstream 6.5.13 changes - Align Debian Build-Depends and CI configuration - Ensure later patches are based on the latest upstream
- Added SPDX-FileCopyrightText for UnionTech Software Technology Co., Ltd. - Added SPDX-License-Identifier CC0-1.0 to CMake configuration file Log: Add license header to CMake configuration
- Merged release/eagle branch into master - Updated Debian changelog with new version entry Log: update version to 6.5.14
dengzhongyuan365-dev
force-pushed
the
master
branch
from
02027f3 to
d7f45e8
Compare
deepin pr auto review我来对这个diff进行代码审查。主要关注以下几个方面：
让我们先分析一下主要变更：
以下是我的审查意见：
具体建议：
// 建议添加超时处理
kxProc.setProcessTimeout(5000); // 5秒超时
if (!kxProc.waitForFinished(5000)) {
kxProc.kill();
qWarning() << "CPU info detection timeout";
}
"permissions": "read" // 如果只需要读取，建议改为read
// 建议抽取公共代码
auto createButton(const QString& icon, const QString& tooltip) {
auto btn = new QPushButton;
btn->setIcon(DDciIcon(icon));
btn->setMaximumSize(36, 36);
btn->setIconSize(QSize(14, 14));
btn->setToolTip(tooltip);
return btn;
}
if(CMAKE_VERSION VERSION_LESS "3.16")
message(FATAL_ERROR "CMake 3.16 or higher is required")
endif()总体来说，这次变更质量良好，主要是一些细节优化建议。 |
lzwind
approved these changes
Dec 2, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: dengzhongyuan365-dev, lzwind The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
Author
|
/forcemerge |
Contributor
|
This pr force merged! (status: unstable) |
Contributor
Author
|
merge |
Contributor
Author
|
/merge |
Contributor
|
This pr cannot be merged! (status: unstable) |
Contributor
Author
|
/forcemerge |
Contributor
|
This pr force merged! (status: unstable) |
Contributor
Author
|
/forcemerge |
Contributor
|
This pr force merged! (status: unstable) |
This was referenced Dec 2, 2025
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
merge to master