Skip to content

fix(reader): construct QSet with explicit insert loop for Qt5/Qt6 com… - #366

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
GongHeng2017:202609041417-master-fix
Sep 4, 2026
Merged

fix(reader): construct QSet with explicit insert loop for Qt5/Qt6 com…#366
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
GongHeng2017:202609041417-master-fix

Conversation

@GongHeng2017

@GongHeng2017 GongHeng2017 commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

…patibility

The iterator-range constructor QSet(begin, end) was introduced in Qt 5.14, causing a build failure on Qt 5.11.3. Using QSet::fromList() instead would break Qt6 builds since it was removed in Qt6. Replace with an explicit insert loop, which compiles on all supported Qt versions (5.11.3, 5.14+, and 6.x).

Log: 修复QSet构造方式在Qt5.11.3和Qt6上的编译兼容性问题
Bug: 本地编译时发现的问题,并无 bug 链接
Influence: 解决reader模块在Qt5.11.3下编译报错,同时保持Qt6兼容

Summary by Sourcery

Bug Fixes:

  • Restore reader builds across supported Qt 5.11.3, Qt 5.14+, and Qt 6 versions by using a Qt-compatible QSet construction approach.

…patibility

The iterator-range constructor QSet(begin, end) was introduced in Qt
5.14, causing a build failure on Qt 5.11.3. Using QSet::fromList()
instead would break Qt6 builds since it was removed in Qt6. Replace
with an explicit insert loop, which compiles on all supported Qt
versions (5.11.3, 5.14+, and 6.x).

Log: 修复QSet构造方式在Qt5.11.3和Qt6上的编译兼容性问题
Bug: 本地编译时发现的问题,并无 bug 链接
Influence: 解决reader模块在Qt5.11.3下编译报错,同时保持Qt6兼容
@sourcery-ai

sourcery-ai Bot commented Sep 4, 2026

Copy link
Copy Markdown
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Updates restored-file set construction in the reader to avoid the QSet iterator-range constructor unavailable in Qt 5.11.3, while retaining compatibility with Qt 6 and existing file merge behavior.

File-Level Changes

Change Details Files
Replace the Qt version-sensitive range construction of the restored-file set with an explicit, cross-version insertion loop.
  • Initialize an empty QSet and insert each restored path individually.
  • Preserve duplicate filtering and restored tab ordering behavior while supporting Qt 5.11.3, Qt 5.14+, and Qt 6.x.
reader/main.cpp

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!

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

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Hey - I've reviewed your changes and they look great!


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: add-uos, GongHeng2017, lzwind

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

@GongHeng2017

Copy link
Copy Markdown
Contributor Author

/forcemerge

@deepin-bot

deepin-bot Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

This pr force merged! (status: unstable)

@deepin-bot
deepin-bot Bot merged commit 290a898 into linuxdeepin:master Sep 4, 2026
8 of 9 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.

4 participants