Skip to content

fix: Remove Qt5 dependencies#321

Merged
caixr23 merged 1 commit intolinuxdeepin:masterfrom
caixr23:master
Mar 26, 2025
Merged

fix: Remove Qt5 dependencies#321
caixr23 merged 1 commit intolinuxdeepin:masterfrom
caixr23:master

Conversation

@caixr23
Copy link
Copy Markdown
Contributor

@caixr23 caixr23 commented Mar 25, 2025

Remove Qt5 dependencies

pms: TASK-361721

Summary by Sourcery

Migrate the project from Qt5 to Qt6 and KF5 to KF6.

Enhancements:

  • Migrate the project from Qt5 to Qt6.
  • Migrate the project from KF5 to KF6.

Remove Qt5 dependencies

pms: TASK-361721
@deepin-ci-robot
Copy link
Copy Markdown

deepin pr auto review

关键摘要:

  • 移除了src-olddcc-network-plugin子目录的引用,确认这些子目录是否不再需要。
  • debian/control文件中移除了libgsettings-qt-devqtbase5-devqttools5-dev-toolslibkf5networkmanagerqt-devlibdtkwidget-devqttools5-dev的依赖,确认这些依赖是否确实不再需要。
  • tests/CMakeLists.txt文件中,将Qt5的依赖更改为Qt6,并添加了Dtk6的依赖,确认这些更改是否与项目的其他部分兼容。
  • tests/CMakeLists.txt文件中,移除了对KF5::NetworkManagerQt的查找,改为查找KF6::NetworkManagerQt,确认这一更改是否正确。

是否建议立即修改:

  • 是,需要确认移除的子目录和依赖项是否确实不再需要,以及Qt6和Dtk6的更改是否与项目的其他部分兼容。如果这些更改是错误的,应该立即修复。

@sourcery-ai
Copy link
Copy Markdown

sourcery-ai Bot commented Mar 25, 2025

Reviewer's Guide by Sourcery

This pull request migrates the project from Qt5 to Qt6, updates related dependencies such as KF5 to KF6 and introduces Dtk6. It also removes some subdirectories and updates the dde-network-core dependency. Additionally, debian packaging files were removed.

No diagrams generated as the changes look simple and do not need a visual representation.

File-Level Changes

Change Details Files
Migrated from Qt5 to Qt6.
  • Replaced find_package(Qt5 ...) with find_package(Qt6 ...).
  • Updated target include directories to use Qt6::Core, Qt6::Network etc.
  • Updated target link libraries to use Qt6::Core, Qt6::Network etc.
tests/CMakeLists.txt
Removed KF5 and related configurations.
  • Removed find_package(KF5NetworkManagerQt REQUIRED) and replaced with find_package(KF6NetworkManagerQt REQUIRED).
  • Removed KF5 related include directories.
  • Removed KF5 related link libraries.
  • Removed variable definitions related to KF5.
tests/CMakeLists.txt
Added Dtk6 dependency.
  • Added find_package(Dtk6 COMPONENTS Core REQUIRED).
  • Added Dtk6::Core to target include directories.
  • Added Dtk6::Core to target link libraries.
tests/CMakeLists.txt
Removed or commented out some subdirectories.
  • Commented out src-old subdirectory.
  • Commented out dcc-network-plugin subdirectory.
  • Commented out example subdirectory.
CMakeLists.txt
Updated dde-network-core dependency.
  • Updated dde-network-core to dde-network-core6 in target link libraries.
tests/CMakeLists.txt
Removed debian packaging files.
  • Removed debian/control.
  • Removed debian/libdde-network-core-dev.install.
debian/control
debian/libdde-network-core-dev.install

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
Copy Markdown

@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 @caixr23 - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider updating the project's C++ standard to C++17 or C++20 to leverage more modern language features.
  • Since Qt5 is removed, consider removing the compatibility code in src-old.
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.

@deepin-ci-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: caixr23, mhduiy

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

@caixr23 caixr23 merged commit 36db3cd into linuxdeepin:master Mar 26, 2025
17 of 18 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