diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-27 11:28:30 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:42:10 +0100 |
| commit | 13ac394567cb287c5caceef15f531544d73fde09 (patch) | |
| tree | 38a497e108b6de6c98e9621e75def96dd8b6a55e /src/pdf | |
| parent | f51f50c22e770e1ab20ecccc8a32906e4014caed (diff) | |
Update dependencies on 'dev' in qt/qtwebengine
Change-Id: I74c7293ebf5ace5bd07e3bf5455dd90bf4ed6380
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/pdf')
| -rw-r--r-- | src/pdf/api/qpdfdocument_p.h | 4 | ||||
| -rw-r--r-- | src/pdf/qpdfdocument.cpp | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/pdf/api/qpdfdocument_p.h b/src/pdf/api/qpdfdocument_p.h index 9a737766b..b6ee2dfd0 100644 --- a/src/pdf/api/qpdfdocument_p.h +++ b/src/pdf/api/qpdfdocument_p.h @@ -58,9 +58,11 @@ #include <QtCore/qpointer.h> #include <QtNetwork/qnetworkreply.h> +#include <mutex> + QT_BEGIN_NAMESPACE -class QPdfMutexLocker : public QMutexLocker +class QPdfMutexLocker : public std::unique_lock<QRecursiveMutex> { public: QPdfMutexLocker(); diff --git a/src/pdf/qpdfdocument.cpp b/src/pdf/qpdfdocument.cpp index 7e0d5e0cc..8fd55dd57 100644 --- a/src/pdf/qpdfdocument.cpp +++ b/src/pdf/qpdfdocument.cpp @@ -51,20 +51,13 @@ QT_BEGIN_NAMESPACE -// The library is not thread-safe at all, it has a lot of global variables. -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) -class QRecursiveMutex : public QMutex -{ - QRecursiveMutex() : QMutex(Recursive) {} -}; -#endif Q_GLOBAL_STATIC(QRecursiveMutex, pdfMutex) static int libraryRefCount; static const double CharacterHitTolerance = 16.0; Q_LOGGING_CATEGORY(qLcDoc, "qt.pdf.document") QPdfMutexLocker::QPdfMutexLocker() - : QMutexLocker(pdfMutex()) + : std::unique_lock<QRecursiveMutex>(*pdfMutex()) { } |