From 7d9f4320533026c9ee9378412d58b9709b018d74 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 8 Sep 2015 09:40:40 +0200 Subject: QQuickText: add a protected constructor Which is used in Label of QtQuick.Controls 2.0. Change-Id: I1228dba59a2a247c8d9556eed7c9a97782d91668 Reviewed-by: J-P Nurmi --- src/quick/items/qquicktext.cpp | 7 +++++++ src/quick/items/qquicktext_p.h | 2 ++ 2 files changed, 9 insertions(+) (limited to 'src/quick') diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index e7dcc73ddb..85c453644e 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1371,6 +1371,13 @@ QQuickText::QQuickText(QQuickItem *parent) d->init(); } +QQuickText::QQuickText(QQuickTextPrivate &dd, QQuickItem *parent) +: QQuickImplicitSizeItem(dd, parent) +{ + Q_D(QQuickText); + d->init(); +} + QQuickText::~QQuickText() { } diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index f92927c9c4..6a4b128f6e 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -264,6 +264,8 @@ Q_SIGNALS: Q_REVISION(6) void bottomPaddingChanged(); protected: + QQuickText(QQuickTextPrivate &dd, QQuickItem *parent = 0); + void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; -- cgit v1.2.3