aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickstyledtext_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/util/qquickstyledtext_p.h')
-rw-r--r--src/quick/util/qquickstyledtext_p.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/util/qquickstyledtext_p.h b/src/quick/util/qquickstyledtext_p.h
index b7d51871a3..9f8ccf31e4 100644
--- a/src/quick/util/qquickstyledtext_p.h
+++ b/src/quick/util/qquickstyledtext_p.h
@@ -19,7 +19,8 @@
#include <QPointF>
#include <QList>
#include <QUrl>
-#include <QtQuick/private/qquickpixmapcache_p.h>
+#include <QScopedPointer>
+#include <QtQuick/private/qquickpixmap_p.h>
QT_BEGIN_NAMESPACE
@@ -31,9 +32,8 @@ class QQmlContext;
class Q_AUTOTEST_EXPORT QQuickStyledTextImgTag
{
public:
- QQuickStyledTextImgTag() { }
-
- ~QQuickStyledTextImgTag() { delete pix; }
+ QQuickStyledTextImgTag() = default;
+ ~QQuickStyledTextImgTag() = default;
enum Align {
Bottom,
@@ -47,7 +47,7 @@ public:
int position = 0;
qreal offset = 0.0; // this offset allows us to compensate for flooring reserved space
Align align = QQuickStyledTextImgTag::Bottom;
- QQuickPixmap *pix = nullptr;
+ QScopedPointer<QQuickPixmap> pix;
};
class Q_AUTOTEST_EXPORT QQuickStyledText