diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:08 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:09 +0200 |
| commit | 9831118378c5d489f76089011277a1b7234a8d68 (patch) | |
| tree | a67e82fde179fa727172fff9098758d60912189d /src/corelib/kernel | |
| parent | b5d471d0c23128528a0aa33ed5172bb1bab05bb1 (diff) | |
| parent | 4fa90c1757c15425d5e0df1a4f5dbc7e77c265f8 (diff) | |
Merge dev into 5.10
Change-Id: I5fb5e7e6e57bb5db6fcb1f670f7f6cbc8def2d60
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcore_mac_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index 5be8df1a48..5522a617b3 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -129,7 +129,8 @@ public: template <typename X> X as() const { return reinterpret_cast<X>(this->value); } static QCFType constructFromGet(const T &t) { - CFRetain(t); + if (t) + CFRetain(t); return QCFType<T>(t); } }; |