Skip to content

fix: Update getHtmlToPdfPath for Qt version compatibility and include cmath in XpsDocument #189

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.

Sign up for GitHub

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

Merged
lzwind merged 2 commits into from
Sep 4, 2025
Merged

fix: Update getHtmlToPdfPath for Qt version compatibility and include cmath in XpsDocument #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62db496
fix: Update getHtmlToPdfPath for Qt version compatibility and include…
dengzhongyuan365-dev Sep 4, 2025
8a359bb
chore: Update version to 6.5.37
dengzhongyuan365-dev Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arm64/linglong.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: "1"
package:
id: org.deepin.reader
name: "deepin-reader"
version: 6.5.36.1
version: 6.5.37.1
kind: app
description: |
reader for deepin os.
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
deepin-reader (6.5.37) unstable; urgency=medium

* fix: Update getHtmlToPdfPath for Qt version compatibility and include cmath in XpsDocument

-- dengzhongyuan <dengzhongyuan@uniontech.com> Thu, 04 Sep 2025 16:56:23 +0800

deepin-reader (6.5.36) unstable; urgency=medium

* bug: Add dynamic path resolution for htmltopdf
Expand Down
2 changes: 1 addition & 1 deletion linglong.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: "1"
package:
id: org.deepin.reader
name: "deepin-reader"
version: 6.5.36.1
version: 6.5.37.1
kind: app
description: |
reader for deepin os.
Expand Down
2 changes: 1 addition & 1 deletion loong64/linglong.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: "1"
package:
id: org.deepin.reader
name: "deepin-reader"
version: 6.5.36.1
version: 6.5.37.1
kind: app
description: |
reader for deepin os.
Expand Down
6 changes: 5 additions & 1 deletion reader/document/Model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@ QString getHtmlToPdfPath() {
qDebug() << "Found htmltopdf in INSTALL_PREFIX: " << path;
return path;
}

#if (QT_VERSION > QT_VERSION_CHECK(6, 0, 0))
path = QLibraryInfo::path(QLibraryInfo::LibrariesPath) + "/deepin-reader/htmltopdf";
#else
path = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + "/deepin-reader/htmltopdf";
#endif

if (QFile::exists(path)) {
qDebug() << "Found htmltopdf in LibrariesPath: " << path;
return path;
Expand Down
2 changes: 1 addition & 1 deletion reader/document/XpsDocument.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
#include <QFontMetrics>
#include <QProcess>
#include <QTemporaryDir>
#include <QDirIterator>

Check warning on line 20 in reader/document/XpsDocument.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QDirIterator> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QImageReader>

Check warning on line 21 in reader/document/XpsDocument.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QImageReader> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QFontDatabase>

Check warning on line 22 in reader/document/XpsDocument.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QFontDatabase> not found. Please note: Cppcheck does not need standard library headers to get proper results.

#include <cmath>

Check warning on line 23 in reader/document/XpsDocument.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <cmath> not found. Please note: Cppcheck does not need standard library headers to get proper results.
namespace deepin_reader {

XpsPage::XpsPage(const XpsPageData &pageData, QMutex *mutex)
Expand Down
Loading