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-13 08:32:52 +0200 |
| commit | 182760e84d19df726418cb79da37636cdb6ff49d (patch) | |
| tree | ee52a136498c6f9fbe36c1a505fa9ce12e137700 /src/corelib | |
| parent | b83225fcc3c6aa5655884cbf9e7391afe38b4392 (diff) | |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -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 1484aafe25..a6638bfaf9 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 |