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

feat: QT6 adaptation #19

Merged
merged 1 commit into from
Jan 9, 2025
Merged

feat: QT6 adaptation #19

merged 1 commit into from
Jan 9, 2025

Conversation

pengfeixx
Copy link
Contributor

QT6 adaptation

Log: QT6 adaptation

@deepin-ci-robot
Copy link

deepin pr auto review

代码审查意见:

  1. CMakeLists.txt文件中,QT_VERSION_MAJORDTK_VERSION的设置应该使用${}来确保它们被正确解析为变量。
  2. src/CMakeLists.txt文件中,find_package语句应该使用${QT_VERSION_MAJOR}${DTK_VERSION}变量来动态查找Qt和Dtk的版本依赖。
  3. src/main.cpp文件中,DApplicationSettings的使用应该根据Qt的版本动态选择,而不是硬编码。
  4. src/source/closewindowdialog.cppsrc/source/gamebutton.cpp等文件中,#include <DApplicationHelper>应该被移除,因为DApplicationHelper在Qt 6中已经被移除。
  5. src/source/gamebutton.cppsrc/source/gamepage.cpp等文件中,#include <QtMultimedia/QSound>应该被移除,因为QSound在Qt 5.15及以上版本中已经被移除。
  6. src/source/gamepage.cpp文件中,QSound的使用应该被替换为QMediaPlayerQAudioOutput,以支持Qt 6。
  7. src/source/gamepage.h文件中,QMediaPlayerQAudioOutput应该被包含,以支持Qt 6。
  8. src/source/gamepage.cpp文件中,QMediaPlayerQAudioOutput的使用应该被正确初始化和配置。
  9. tests/CMakeLists.txt文件中,find_package语句应该使用${QT_VERSION_MAJOR}${DTK_VERSION}变量来动态查找Qt和Dtk的版本依赖。
  10. tests/CMakeLists.txt文件中,target_link_libraries语句应该使用${LINK_LIBS}变量来动态链接Qt和Dtk的库。
  11. tests/src/ut_closewindowdialog.cpptests/src/ut_gameblureffectwidget.cpp等测试文件中,qInfo语句应该使用Qt::endl来确保输出格式的一致性。

以上是针对代码修改的一些改进建议,希望能够对你有所帮助。

QT6 adaptation

Log: QT6 adaptation
Copy link
Contributor

@myk1343 myk1343 left a comment

Choose a reason for hiding this comment

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

+1

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: myk1343, pengfeixx

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

@pengfeixx pengfeixx merged commit 8e035cf into linuxdeepin:master Jan 9, 2025
15 of 17 checks passed
@pengfeixx pengfeixx deleted the qt6 branch January 9, 2025 09:03
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