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

adapt to Qt6 #8

Merged
merged 2 commits into from
Jan 6, 2025
Merged

adapt to Qt6 #8

merged 2 commits into from
Jan 6, 2025

Conversation

Johnson-zs
Copy link
Contributor

No description provided.

as title

Log:
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: 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

Copy link

github-actions bot commented Jan 3, 2025

TAG Bot

TAG: 1.5.1
EXISTED: no
DISTRIBUTION: unstable

@Johnson-zs Johnson-zs force-pushed the master branch 2 times, most recently from f05ac56 to b0dac9a Compare January 6, 2025 03:18
@deepin-ci-robot
Copy link

deepin pr auto review

代码审查意见:

  1. CMakeLists.txt:

    • CMakeLists.txt中,set(VERSION "1.0.0" CACHE STRING "PDF rendering library based on PDFium")这行代码将版本号硬编码为"1.0.0",建议使用变量来动态设置版本号,以便于版本管理。
    • add_compile_options(-fstack-protector-strong)编译选项在大多数情况下是安全的,但应确保目标平台支持此选项。
    • find_package(Qt6 COMPONENTS Core Gui REQUIRED)中,REQUIRED关键字确保了如果找不到Qt6,CMake会报错并停止配置。这是一个好的实践。
    • add_subdirectory(src/3rdparty/pdfium)应该检查pdfium目录是否存在,以避免因目录不存在而导致的配置错误。
  2. README.md:

    • README.md中,依赖项列表应该按照字母顺序排列,以提高可读性。
  3. README.zh_CN.md:

    • 同样,在README.zh_CN.md中,依赖项列表也应该按照字母顺序排列。
  4. debian/changelog:

    • debian/changelog中,版本号从1.5.0更新到1.5.1,建议在更新版本号时,同时更新其他相关文档和配置文件中的版本号。
  5. debian/libdeepin-pdfium-dev.install:

    • debian/libdeepin-pdfium-dev.install中,新增了/usr/lib/*/cmake/deepin-pdfium/*的安装路径,这是一个好的实践,确保了CMake模块的正确安装。
  6. deepin-pdfium.pc.in:

    • deepin-pdfium.pc.in中,Requires字段从Qt5Core Qt5Gui更新为Qt6Core Qt6Gui,这是一个必要的更改,以适应Qt6的依赖。
  7. include/dpdfannot.h:

    • include/dpdfannot.h中,DEEPDF_EXPORT宏的定义被移除,这可能会影响编译。如果DEEPDF_EXPORT宏在项目中其他地方有定义,建议保留。
  8. include/dpdfdoc.h:

    • include/dpdfdoc.h中,DEEPDF_EXPORT宏的定义被移除,这可能会影响编译。如果DEEPDF_EXPORT宏在项目中其他地方有定义,建议保留。
  9. include/dpdfglobal.h:

    • include/dpdfglobal.h中,DEEPDF_EXPORT宏的定义被移除,这可能会影响编译。如果DEEPDF_EXPORT宏在项目中其他地方有定义,建议保留。
  10. include/dpdfpage.h:

    • include/dpdfpage.h中,DEEPDF_EXPORT宏的定义被移除,这可能会影响编译。如果DEEPDF_EXPORT宏在项目中其他地方有定义,建议保留。
  11. misc/deepin-pdfiumConfig.cmake.in:

    • misc/deepin-pdfiumConfig.cmake.in中,新增了find_dependency(PkgConfig)pkg_check_modules(PDFIUM_DEPS REQUIRED ...)来检查依赖,这是一个好的实践。

总体来说,代码的修改主要是为了适应Qt6的依赖,并且增加了对CMake模块的支持。这些修改是合理的,但需要确保所有相关的依赖和配置文件都已经更新,并且测试了修改后的代码以确保其正确性和稳定性。

1.5.1

Log: tag 1.5.1
@Johnson-zs
Copy link
Contributor Author

/forcemerge

@deepin-bot
Copy link

deepin-bot bot commented Jan 6, 2025

This pr force merged! (status: blocked)

@deepin-bot deepin-bot bot merged commit 9219801 into linuxdeepin:master Jan 6, 2025
18 checks passed
@Zeno-sole
Copy link
Contributor

/topic cd-20250211

@deepin-ci-robot
Copy link

Add topic: cd-20250211 successed.

@Zeno-sole
Copy link
Contributor

/integr-topic cd-20250211

@deepin-ci-robot
Copy link

Integrated with pr deepin-community/Repository-Integration#2569

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

3 participants