diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-04-04 13:10:57 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-04-04 13:10:57 +0000 |
| commit | eeee6534ff32da51c9c39934aeab2b60b1b34f7b (patch) | |
| tree | 90f6fffbc115906220537bfd1c781d09808b3c5f /graphics/dspdfviewer | |
| parent | 2dc064e2f3f31b776332ccae05a55af0349d0fee (diff) | |
| download | ports-eeee6534ff32da51c9c39934aeab2b60b1b34f7b.tar.gz ports-eeee6534ff32da51c9c39934aeab2b60b1b34f7b.zip | |
graphics/dspdfviewer: Prepare for Qt5-5.14
PR: 244964
Notes
Notes:
svn path=/head/; revision=530656
Diffstat (limited to 'graphics/dspdfviewer')
| -rw-r--r-- | graphics/dspdfviewer/files/patch-dspdfviewer.cpp | 13 | ||||
| -rw-r--r-- | graphics/dspdfviewer/files/patch-dspdfviewer.h | 30 |
2 files changed, 43 insertions, 0 deletions
diff --git a/graphics/dspdfviewer/files/patch-dspdfviewer.cpp b/graphics/dspdfviewer/files/patch-dspdfviewer.cpp index c402cef12a87..d9e8b04e8a54 100644 --- a/graphics/dspdfviewer/files/patch-dspdfviewer.cpp +++ b/graphics/dspdfviewer/files/patch-dspdfviewer.cpp @@ -6,6 +6,19 @@ Fix build with Clang 8: --- dspdfviewer.cpp.orig 2016-09-13 13:18:47 UTC +++ dspdfviewer.cpp +@@ -292,10 +292,10 @@ void DSPDFViewer::sendAllClockSignals() const + emit presentationClockUpdate(presentationClock()); + } + +-QTime DSPDFViewer::timeSince(const QTime& startPoint) const ++QTime DSPDFViewer::timeSince(const QElapsedTimer& startPoint) const + { + QTime result(0,0); +- result = result.addMSecs(startPoint.elapsed()); ++ result = result.addMSecs(static_cast<int>(startPoint.elapsed())); + return result; + } + @@ -308,7 +308,7 @@ RenderingIdentifier DSPDFViewer::toRenderIdent(unsigne RenderingIdentifier DSPDFViewer::toThumbnailRenderIdent(unsigned int pageNumber, PDFViewerWindow& window) diff --git a/graphics/dspdfviewer/files/patch-dspdfviewer.h b/graphics/dspdfviewer/files/patch-dspdfviewer.h new file mode 100644 index 000000000000..f673089ad69b --- /dev/null +++ b/graphics/dspdfviewer/files/patch-dspdfviewer.h @@ -0,0 +1,30 @@ +--- dspdfviewer.h.orig 2016-09-13 13:18:47 UTC ++++ dspdfviewer.h +@@ -22,6 +22,7 @@ + #define dspdfviewer_H + + #include <QObject> ++#include <QElapsedTimer> + #include <QTimer> + #include <QFileSystemWatcher> + #include "poppler-qt.h" +@@ -42,8 +43,8 @@ class DSPDFViewer: public QObject (private) + + private: + QTimer clockDisplayTimer; +- QTime slideStart; +- QTime presentationStart; ++ QElapsedTimer slideStart; ++ QElapsedTimer presentationStart; + bool presentationClockRunning; + + private: +@@ -89,7 +90,7 @@ private slots: (public) + QTime slideClock() const; + QTime presentationClock() const; + +- QTime timeSince( const QTime& startPoint) const; ++ QTime timeSince( const QElapsedTimer& startPoint) const; + + bool isAudienceScreenBlank() const; + |