Skip to content

Fix: Qt6 / Qt5 compatibility | Bump version to 6.5.23#347

Merged
rb-union merged 2 commits intolinuxdeepin:masterfrom
rb-union:bump_version
Apr 16, 2025
Merged

Fix: Qt6 / Qt5 compatibility | Bump version to 6.5.23#347
rb-union merged 2 commits intolinuxdeepin:masterfrom
rb-union:bump_version

Conversation

@rb-union
Copy link
Contributor

@rb-union rb-union commented Apr 16, 2025

Fix: Add Qt6 support while maintaining Qt5 compatibility

Change dde-qt5integration to dde-qt6integration | dde-qt5integration
Change libdtkwidget5 to libdtk6widget | libdtkwidget5

Log: Update dependencies to support both Qt5 and Qt6

chore: Bump version to 6.5.23

Bump version to 6.5.23

Log: Bump version to 6.5.23

Summary by Sourcery

Update project to support Qt6 while maintaining Qt5 compatibility and bump the application version

New Features:

  • Add support for Qt6 alongside existing Qt5 compatibility

Enhancements:

  • Update project dependencies to work with both Qt5 and Qt6 frameworks

Chores:

  • Bump application version from 6.5.22.1 to 6.5.23.1 across multiple configuration files

Change dde-qt5integration to dde-qt6integration | dde-qt5integration
Change libdtkwidget5 to libdtk6widget | libdtkwidget5

Log: Update dependencies to support both Qt5 and Qt6
Bump version to 6.5.23

Log: Bump version to 6.5.23
@github-actions
Copy link

  • 检测到debian目录文件有变更: debian/control

@deepin-ci-robot
Copy link

deepin pr auto review

代码审查意见:

  1. 版本号更新

    • arm64/linglong.yamldebian/changeloglinglong.yamlloong64/linglong.yaml文件中,版本号从6.5.22.1更新到6.5.23.1。确保这一变更与实际的功能更新或修复相匹配,并且版本号遵循语义化版本控制规则。
  2. 依赖项更新

    • debian/control文件中,dde-qt5integration被替换为dde-qt6integration,并且libdtkwidget5被替换为libdtk6widget。确认这一变更是否与Qt6的引入兼容,并且是否有相应的代码更新来支持这一变化。
  3. Changelog格式

    • debian/changelog文件中,提交信息使用了fix而不是fix:,建议使用fix:来保持一致性。
  4. 文件权限

    • loong64/linglong.yaml文件中,文件权限被设置为100755,这通常表示可执行文件。如果linglong.yaml文件不需要执行权限,建议将其权限设置为100644
  5. 描述一致性

    • 确保所有linglong.yaml文件中的描述信息保持一致,以避免在不同平台或版本之间出现误导。
  6. 注释和文档

    • 考虑在debian/changeloglinglong.yaml文件中添加更多的注释或文档,说明版本更新的具体内容,以便其他开发者或用户理解变更的背景和目的。
  7. 测试

    • 在进行版本更新和依赖项变更后,确保进行充分的测试,包括单元测试、集成测试和用户验收测试,以确保新版本的功能正常并且没有引入新的问题。
  8. 兼容性

    • 确保所有依赖项的变更不会影响现有用户的体验,特别是对于dde-qt5integrationdde-qt6integration的替换,需要确保应用程序能够兼容两个版本的Qt。

综上所述,代码的版本更新和依赖项变更看起来是合理的,但需要确保这些变更与实际的功能实现相匹配,并且进行了充分的测试和文档说明。

@sourcery-ai
Copy link

sourcery-ai bot commented Apr 16, 2025

Reviewer's Guide by Sourcery

This pull request updates the application to support both Qt5 and Qt6 by modifying dependencies and bumps the version to 6.5.23. The dependencies dde-qt5integration and libdtkwidget5 were updated to dde-qt6integration and libdtk6widget respectively. The application version was updated in the linglong.yaml and debian/changelog files.

Updated class diagram for dependencies

classDiagram
  class deepin-editor {
    - dde-qt5integration
    - libdtkwidget5
    + dde-qt6integration
    + libdtk6widget
  }
  note for deepin-editor "Updated dependencies to support both Qt5 and Qt6"
Loading

File-Level Changes

Change Details Files
Updated dependencies to support both Qt5 and Qt6.
  • Changed dde-qt5integration to dde-qt6integration.
  • Changed libdtkwidget5 to libdtk6widget.
debian/changelog
debian/control
Bumped the application version.
  • Updated the version to 6.5.23.1 in the linglong.yaml files.
  • Updated the version to 6.5.23 in the debian/changelog file.
arm64/linglong.yaml
linglong.yaml
loong64/linglong.yaml
debian/changelog

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @rb-union - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider using a script to update the version across all files to avoid manual errors.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@github-actions
Copy link

TAG Bot

TAG: 6.5.23
EXISTED: no
DISTRIBUTION: unstable

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: lzwind, rb-union

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rb-union rb-union merged commit 4a4ad41 into linuxdeepin:master Apr 16, 2025
18 of 21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants