fix: include Qt private modules for Qt 6.11#574
Merged
wineee merged 1 commit intolinuxdeepin:masterfrom Sep 29, 2025
Merged
Conversation
This commit explicitly includes `GuiPrivate` and `QuickPrivate` Qt modules in `CMakeLists.txt` for both the `waylib` and `waylib/src/ server` directories. This is necessary because Qt 6.11 and later versions no longer implicitly include these private modules. Failing to include them results in build failures due to missing headers and symbols. Log: Fixed build issue with Qt 6.11 and later versions by explicitly including necessary private Qt modules. Influence: 1. Verify that the project builds successfully with Qt versions 6.11 and later. 2. Ensure that all functionalities relying on Qt private modules (e.g., custom QML components, internal Qt API usage) continue to work as expected. 3. Test on different platforms (Linux, Windows, macOS) where Qt is used. fix: 为 Qt 6.11 包含 Qt 私有模块 此提交在 `waylib` 和 `waylib/src/server` 目录的 `CMakeLists.txt` 中显式 包含 `GuiPrivate` 和 `QuickPrivate` Qt 模块。 这是必要的,因为 Qt 6.11 及更高版本不再隐式包含这些私有模块。 未能包含它们会导致由于缺少头文件和 符号而导致构建失败。 Log: 通过显式包含必要的私有 Qt 模块,修复了 Qt 6.11 及更高版本的构建 问题。 Influence: 1. 验证项目是否可以使用 Qt 6.11 及更高版本成功构建。 2. 确保所有依赖于 Qt 私有模块的功能(例如,自定义 QML 组件、内部 Qt API 使用)继续按预期工作。 3. 在使用 Qt 的不同平台(Linux、Windows、macOS)上进行测试。
Reviewer's guide (collapsed on small PRs)Reviewer's GuideEnsure compatibility with Qt 6.11+ by explicitly adding GuiPrivate and QuickPrivate modules in CMake configuration and updating conditional header inclusion for generic Unix theme support. File-Level Changes
Possibly linked issues
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this comment.
Hey there - I've reviewed your changes - here's some feedback:
- Wrap the addition of GuiPrivate and QuickPrivate in CMakeLists with a Qt version check (or bump the minimum Qt version) to avoid breakage on older Qt releases.
- Relying on Qt private modules can be brittle—consider if any of that functionality can be migrated to supported public APIs for future compatibility.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Wrap the addition of GuiPrivate and QuickPrivate in CMakeLists with a Qt version check (or bump the minimum Qt version) to avoid breakage on older Qt releases.
- Relying on Qt private modules can be brittle—consider if any of that functionality can be migrated to supported public APIs for future compatibility.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
wineee
approved these changes
Sep 29, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: wineee, zccrs 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 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This commit explicitly includes
GuiPrivateandQuickPrivateQt modules inCMakeLists.txtfor both thewaylibandwaylib/src/ serverdirectories. This is necessary because Qt 6.11 and later versions no longer implicitly include these private modules. Failing to include them results in build failures due to missing headers and symbols.Log: Fixed build issue with Qt 6.11 and later versions by explicitly including necessary private Qt modules.
Influence:
fix: 为 Qt 6.11 包含 Qt 私有模块
此提交在
waylib和waylib/src/server目录的CMakeLists.txt中显式 包含GuiPrivate和QuickPrivateQt 模块。 这是必要的,因为 Qt 6.11 及更高版本不再隐式包含这些私有模块。 未能包含它们会导致由于缺少头文件和符号而导致构建失败。
Log: 通过显式包含必要的私有 Qt 模块,修复了 Qt 6.11 及更高版本的构建
问题。
Influence:
Summary by Sourcery
Ensure compatibility with Qt 6.11 and later by explicitly adding required private modules and updating private header includes.
Bug Fixes:
Enhancements: