diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-08 09:40:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-08 15:44:57 +0000 |
| commit | 7d9f4320533026c9ee9378412d58b9709b018d74 (patch) | |
| tree | 18c5e06e2fdc58d9de0fb4a43ccbec745fd911e3 | |
| parent | 6586c02058fe2b40bafe96c0d6b583f9bab45656 (diff) | |
QQuickText: add a protected constructor
Which is used in Label of QtQuick.Controls 2.0.
Change-Id: I1228dba59a2a247c8d9556eed7c9a97782d91668
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 7 | ||||
| -rw-r--r-- | src/quick/items/qquicktext_p.h | 2 |
2 files changed, 9 insertions, 0 deletions
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; |