Skip to content

chore: adapt to qt6xdg - #224

Merged
kegechen merged 1 commit into
linuxdeepin:masterfrom
kegechen:qt6xdg
Jul 8, 2024
Merged

chore: adapt to qt6xdg#224
kegechen merged 1 commit into
linuxdeepin:masterfrom
kegechen:qt6xdg

Conversation

@kegechen

Copy link
Copy Markdown
Contributor

@kegechen
kegechen requested a review from asterwyx June 18, 2024 05:37
deepin-ci-robot added a commit to linuxdeepin/qt6integration that referenced this pull request Jun 18, 2024
Synchronize source files from linuxdeepin/qt5integration.

Source-pull-request: linuxdeepin/qt5integration#224
@kegechen
kegechen requested a review from BLumia June 18, 2024 05:46
asterwyx
asterwyx previously approved these changes Jun 18, 2024
deepin-ci-robot added a commit to linuxdeepin/qt6integration that referenced this pull request Jun 18, 2024
Synchronize source files from linuxdeepin/qt5integration.

Source-pull-request: linuxdeepin/qt5integration#224
@deepin-ci-robot

Copy link
Copy Markdown
Contributor

deepin pr auto review

关键摘要:

  • CMakeLists.txt文件中,option命令的使用可能不正确,因为它应该在find_package之前使用。
  • find_package命令的调用顺序似乎与find_package的文档说明不一致,应该检查是否需要调整以匹配文档中的顺序。
  • if("${QT_VERSION_MAJOR}" STREQUAL "5")elseif("${QT_VERSION_MAJOR}" STREQUAL "6")的条件判断可以简化,使用if语句直接比较字符串和数字。
  • list(APPEND QT_LIBS Qt5::X11Extras)CMakeLists.txt文件中调用,但在find_package之后,这可能会导致Qt5::X11Extras没有被正确地添加到QT_LIBS列表中。
  • find_package(PkgConfig REQUIRED)之后没有调用pkg_check_modules,这可能会导致依赖项没有被正确地检查。
  • if(ENABLE_QT_XDG_ICON_LOADER)条件判断之后,list(APPEND QT_LIBS ${QT_XDG_ICON_DEPS})应该在find_package之后调用,以确保所有必要的库都被正确地添加到QT_LIBS列表中。

是否建议立即修改:

@kegechen
kegechen requested a review from asterwyx June 18, 2024 08:56
@deepin-bot

deepin-bot Bot commented Jun 27, 2024

Copy link
Copy Markdown
Contributor

TAG Bot

New tag: 5.6.31
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #225

@deepin-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: FeiWang1119, kegechen

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

@kegechen
kegechen merged commit 5e4520c into linuxdeepin:master Jul 8, 2024
kegechen pushed a commit to linuxdeepin/qt6integration that referenced this pull request Jul 12, 2024
Synchronize source files from linuxdeepin/qt5integration.

Source-pull-request: linuxdeepin/qt5integration#224
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