diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 18:47:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 18:47:22 +0200 |
| commit | e0b2a30357a6fbb2d52fcba69f0a5059d3b065b8 (patch) | |
| tree | 16a9d17fed29477a56b498a997a2eecc14c68b32 /src/quicktemplates2/qquickicon_p.h | |
| parent | e15a6a37d297bb466b96c3baf6073cc971c56ba2 (diff) | |
| parent | 6861949d40ec8a4a5687e6dbd990f13904d1741f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/quicktemplates2/qquickicon_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickicon_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickicon_p.h b/src/quicktemplates2/qquickicon_p.h index 57cab720..1835585d 100644 --- a/src/quicktemplates2/qquickicon_p.h +++ b/src/quicktemplates2/qquickicon_p.h @@ -107,7 +107,7 @@ public: QQuickIcon resolve(const QQuickIcon &other) const; private: - QSharedDataPointer<QQuickIconPrivate> d; + QExplicitlySharedDataPointer<QQuickIconPrivate> d; }; QT_END_NAMESPACE |