diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 09:50:42 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-14 12:46:06 +0200 |
| commit | 20bcff105019ee5700575b77565bf3d90ea8b9bc (patch) | |
| tree | 285fac4d3389d1a3486a3ae67c1ce36c82e4f7ba | |
| parent | ec1d4a2bcaca0b4e13dc33384b3c8d92ed087acc (diff) | |
Fix detach on bool check of QSharedDataPointer
We have a conversion to T* which would be triggered for a non negated
bool check.
Change-Id: I543c66de6b4da64a3a63ee9a438fab6adcc58052
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 182760e84d19df726418cb79da37636cdb6ff49d)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/corelib/tools/qshareddata.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index f123f8e7b9..c114fa9d11 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -124,6 +124,7 @@ public: return *this; } + inline operator bool () const noexcept { return d != nullptr; } inline bool operator!() const { return !d; } inline void swap(QSharedDataPointer &other) noexcept |