From 7a2b97fc4765ed17c494b39fe4fbc2297f0c602b Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 15 Oct 2020 09:25:52 +0000 Subject: Revert "Fix detach on bool check of QSharedDataPointer" This reverts commit 20bcff105019ee5700575b77565bf3d90ea8b9bc. Reason for revert: Makes QSharedDataPointer comparisons ambiguous without overloading comparison operators Change-Id: I5ad36f39505490812675afc6a435f6c43b2c0d0d Fixes: QTBUG-87611 Reviewed-by: Alex Blasche --- src/corelib/tools/qshareddata.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index c114fa9d11..f123f8e7b9 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -124,7 +124,6 @@ public: return *this; } - inline operator bool () const noexcept { return d != nullptr; } inline bool operator!() const { return !d; } inline void swap(QSharedDataPointer &other) noexcept -- cgit v1.2.3