From b28ae59530475bb47dca1c12c5c93dfc293a4a78 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 20 Oct 2021 22:22:01 +0200 Subject: options: fix support for older Qt5 Reported by @DaWelter. --- options/bundle.hpp | 4 ++-- options/connector.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/options/bundle.hpp b/options/bundle.hpp index 15965bc9..158fcef9 100644 --- a/options/bundle.hpp +++ b/options/bundle.hpp @@ -46,7 +46,7 @@ class OTR_OPTIONS_EXPORT bundle final : public QObject, public connector friend struct bundler; - mutable QRecursiveMutex mtx; + mutable QMutex mtx { QMutex::Recursive }; const QString group_name; group saved; group transient; @@ -62,7 +62,7 @@ public: bundle(const bundle&) = delete; bundle& operator=(const bundle&) = delete; - QRecursiveMutex* get_mtx() const override { return &mtx; } + QMutex* get_mtx() const override { return &mtx; } QString name() const { return group_name; } explicit bundle(const QString& group_name); diff --git a/options/connector.hpp b/options/connector.hpp index 01d1d1db..025efda2 100644 --- a/options/connector.hpp +++ b/options/connector.hpp @@ -38,7 +38,7 @@ class OTR_OPTIONS_EXPORT connector protected: void notify_values(const QString& name) const; void notify_all_values() const; - virtual QRecursiveMutex* get_mtx() const = 0; + virtual QMutex* get_mtx() const = 0; void set_all_to_default_(); public: -- cgit v1.2.3