diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:02:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:02:29 +0200 |
| commit | 386d64e16f48930b9d1154ba6f59779df97fb5b7 (patch) | |
| tree | eb560f3b5835f8cfc6c8f7474f8895609c1ea904 /src/quicktemplates2/qquickicon_p.h | |
| parent | 77e577592e64ab9b099de09c281140c60c898df7 (diff) | |
| parent | dea650f0ad8b33fafc2d6fd30733466602aaafee (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
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 |