Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ensure Qt resources are properly loaded #2500

Merged
merged 3 commits into from
Dec 23, 2024

Conversation

Johnson-zs
Copy link
Contributor

Move find_package(Qt Core) before qt_add_resources since Qt resource compilation requires Qt components to be found first.

Log:

Bug: https://pms.uniontech.com/bug-view-292585.html

Move find_package(Qt Core) before qt_add_resources since Qt resource
compilation requires Qt components to be found first.

Log:

Bug: https://pms.uniontech.com/bug-view-292585.html
1. uncheck an organized collection;
2. change the wallpaper;
3. crash.

the event is not unsubscribed when collection removed at step 1, when
the wallpaper event emitted, the event handler executed with nullptr,
cause crash.
unsubscribe signal when collection destroyed.

Log: as above.

Bug: https://pms.uniontech.com/bug-view-271449.html
6.5.10.2

Log: tag 6.5.10.2
@deepin-ci-robot
Copy link

deepin pr auto review

代码审查意见:

  1. Changelog 文件更新

    • debian/changelog 文件中,新增了一个条目,但未提供具体的修复内容或改进点。建议在提交信息中详细说明修复了哪些问题或增加了哪些功能。
  2. CMakeLists.txt 文件修改

    • src/plugins/desktop/ddplugin-organizer/ddplugin-organizer.cmake 文件中,将 find_package 的调用移动到了文件顶部。这是一个好的做法,因为它确保了在配置阶段就能找到所需的 Qt 组件,避免了后续可能出现的编译错误。
    • 注释 find_package 的调用被移除了,这可能会影响其他未修改的 CMakeLists.txt 文件,需要确认这一改动是否适用于所有相关文件。
  3. NormalizedMode.cpp 文件修改

    • src/plugins/desktop/ddplugin-organizer/mode/normalizedmode.cpp 文件中,添加了一个信号连接,用于在 CollectionWidget 被销毁时取消订阅信号。这是一个合理的改动,可以避免内存泄漏。
    • 连接的槽函数使用了 lambda 表达式,这是一个好的实践,因为它可以避免创建不必要的函数对象。

总体来说,这些改动看起来是合理的,但需要确保它们不会引入新的问题,并且与项目的其他部分兼容。特别是 find_package 的调用位置改动,需要仔细检查以确保不会影响其他模块的编译。

Copy link

TAG Bot

TAG: 6.5.10.2
EXISTED: no
DISTRIBUTION: unstable

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Clauszy, Johnson-zs

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

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

@Johnson-zs Johnson-zs merged commit 6676f35 into linuxdeepin:release/v23 Dec 23, 2024
21 checks passed
@Zeno-sole
Copy link
Contributor

/integrate

Copy link

AutoIntegrationPr Bot
auto integrate with pr url: deepin-community/Repository-Integration#2397
PrNumber: 2397
PrBranch: auto-integration-12480059193

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