diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-05 09:58:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-05 09:59:59 +0100 |
| commit | b36c5bdc30040b5100da2a003056d3519972e178 (patch) | |
| tree | 952e951bef0add6ee0ff0046c018d663568f9953 /src/corelib/tools | |
| parent | 47869340b97686a4bf852f94edc3bae1e50d7053 (diff) | |
| parent | c9d18d4a9c9d1243a267316e2a702f9ba69de2fd (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12.0
Conflicts:
src/plugins/platforms/cocoa/qcocoaglcontext.mm
src/plugins/platforms/xcb/qxcbscreen.h
Change-Id: If9b4c67288396ff7346088ce591c7a3588b51979
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qsharedpointer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index e58d3ab6bc..622b03f42d 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -1384,6 +1384,9 @@ QtSharedPointer::ExternalRefCountData *QtSharedPointer::ExternalRefCountData::ge x->strongref.store(-1); x->weakref.store(2); // the QWeakPointer that called us plus the QObject itself if (!d->sharedRefcount.testAndSetRelease(0, x)) { + // ~ExternalRefCountData has a Q_ASSERT, so we use this trick to + // only execute this if Q_ASSERTs are enabled + Q_ASSERT((x->weakref.store(0), true)); delete x; x = d->sharedRefcount.loadAcquire(); x->weakref.ref(); |