From 182760e84d19df726418cb79da37636cdb6ff49d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 09:50:42 +0200 Subject: [PATCH] Fix detach on bool check of QSharedDataPointer We have a conversion to T* which would be triggered for a non negated bool check. Pick-to: 5.15 Change-Id: I543c66de6b4da64a3a63ee9a438fab6adcc58052 Reviewed-by: Thiago Macieira --- src/corelib/tools/qshareddata.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index 1484aafe25c..a6638bfaf9e 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -118,6 +118,7 @@ public: QSharedDataPointer(QSharedDataPointer &&o) noexcept : d(qExchange(o.d, nullptr)) {} QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QSharedDataPointer) + inline operator bool () const noexcept { return d != nullptr; } inline bool operator!() const noexcept { return !d; } inline void swap(QSharedDataPointer &other) noexcept