feat: add DTK6/Qt6 support and unified build profiles #294
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
deepin-ci-robot
added a commit
to linuxdeepin/qt6integration
that referenced
this pull request
Dec 29, 2025
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#294
Contributor
|
Warning
|
Contributor
|
Note
详情{
"CMakeLists.txt": [
{
"line": " HOMEPAGE_URL \"https://github.com/linuxdeepin/qt5integration\"",
"line_number": 14,
"rule": "S35",
"reason": "Url link | cc21178aa0"
}
]
} |
deepin-ci-robot
added a commit
to linuxdeepin/qt6integration
that referenced
this pull request
Dec 30, 2025
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#294
Contributor
|
Warning
|
Contributor
|
Note
详情{
"CMakeLists.txt": [
{
"line": " HOMEPAGE_URL \"https://github.com/linuxdeepin/qt5integration\"",
"line_number": 14,
"rule": "S35",
"reason": "Url link | cc21178aa0"
}
]
} |
Contributor
deepin pr auto review我来对这个代码变更进行详细审查：
改进建议：
改进建议：
在 CMakeLists.txt 中添加版本检查： if(NOT (DTK_VERSION_MAJOR EQUAL QT_VERSION_MAJOR))
message(FATAL_ERROR "DTK version major number (${DTK_VERSION_MAJOR}) must match Qt version major number (${QT_VERSION_MAJOR})")
endif()在 debian/rules 中添加版本映射说明： # 版本映射规则：
# 将版本号 x.y.z 映射为：
# DTK5: 5.y.z
# DTK6: 6.y.z
DTK5_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -E 's/^[0-9]+(\.|[^0-9]|$$)/5\1/')
DTK6_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -E 's/^[0-9]+(\.|[^0-9]|$$)/6\1/')
总的来说，这是一个不错的重构，提高了代码的可维护性和灵活性，但还可以进一步完善安全性和文档。 |
deepin-ci-robot
added a commit
to linuxdeepin/qt6integration
that referenced
this pull request
Dec 30, 2025
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#294
Contributor
|
Warning
|
Contributor
|
Note
详情{
"CMakeLists.txt": [
{
"line": " HOMEPAGE_URL \"https://github.com/linuxdeepin/qt5integration\"",
"line_number": 14,
"rule": "S35",
"reason": "Url link | cc21178aa0"
}
]
} |
mhduiy
previously approved these changes
Dec 31, 2025
1. Modified debian/control to support both DTK5/Qt5 and DTK6/Qt6 builds 2. Added conditional build dependencies using Build-Profiles (<!nodtk5> and <!nodtk6>) 3. Created new dde-qt6integration package alongside existing dde- qt5integration 4. Added separate .install files for Qt5 and Qt6 plugin installations 5. Reorganized build dependencies to separate Qt5 and Qt6 specific packages Log: Added support for DTK6 with Qt6 integration plugins Influence: 1. Test building with default profile (both DTK5 and DTK6) 2. Test building with nodtk5 profile (DTK6 only) 3. Test building with nodtk6 profile (DTK5 only) 4. Verify both dde-qt5integration and dde-qt6integration packages are created correctly 5. Check that plugin files are installed to correct Qt5 and Qt6 directories 6. Verify package dependencies are correctly set for each integration package feat: 添加DTK6/Qt6支持和统一构建配置 1. 修改debian/control以支持DTK5/Qt5和DTK6/Qt6双版本构建 2. 使用构建配置文件添加条件依赖（<!nodtk5>和<!nodtk6>） 3. 在现有dde-qt5integration包基础上新增dde-qt6integration包 4. 为Qt5和Qt6插件安装添加独立的.install文件 5. 重新组织构建依赖，分离Qt5和Qt6特定包 Log: 新增DTK6与Qt6集成插件支持 Influence: 1. 测试默认配置文件构建（同时构建DTK5和DTK6） 2. 测试使用nodtk5配置文件构建（仅构建DTK6） 3. 测试使用nodtk6配置文件构建（仅构建DTK5） 4. 验证dde-qt5integration和dde-qt6integration包是否正确生成 5. 检查插件文件是否正确安装到Qt5和Qt6目录 6. 验证各集成包的依赖关系是否正确设置
deepin-ci-robot
added a commit
to linuxdeepin/qt6integration
that referenced
this pull request
Dec 31, 2025
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#294
Contributor
|
Warning
|
Contributor
|
Note
详情{
"CMakeLists.txt": [
{
"line": " HOMEPAGE_URL \"https://github.com/linuxdeepin/qt5integration\"",
"line_number": 14,
"rule": "S35",
"reason": "Url link | cc21178aa0"
}
],
"archlinux/PKGBUILD": [
{
"line": "url=\"https://github.com/linuxdeepin/qt5integration\"",
"line_number": 10,
"rule": "S35",
"reason": "Url link | cc21178aa0"
}
]
} |
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 18202781743 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 |
1 similar comment
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 18202781743 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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
and <!nodtk6>)
qt5integration
packages
Log: Added support for DTK6 with Qt6 integration plugins
Influence:
created correctly
directories
package
feat: 添加DTK6/Qt6支持和统一构建配置
Log: 新增DTK6与Qt6集成插件支持
Influence: