diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-11-10 14:58:17 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-09 10:20:35 +0100 |
| commit | 5603019ea26d036f65e66ba290e7414121acd008 (patch) | |
| tree | 1ebd88df282a18558500e4bcbddc2a707d39ec6c /src/quick/items/qquicktextedit_p_p.h | |
| parent | 8724847a9e26e17852ee08b9b0d70b1d648661a0 (diff) | |
Create a copy of QTextControl in the QtDeclarative library.
First half of a move of QTextControl from qtbase to qtdeclarative, some
time in the future QTextControl will be deleted from qtbase to finish
the move.
Task-number: QTBUG-22627
Change-Id: I72da2c71ab5b090e2a0a15219b81e522e97c541b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextedit_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextedit_p_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h index 583b13bc69..4413ec001f 100644 --- a/src/quick/items/qquicktextedit_p_p.h +++ b/src/quick/items/qquicktextedit_p_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE class QTextLayout; class QQuickTextDocumentWithImageResources; -class QTextControl; +class QQuickTextControl; class QQuickTextEditPrivate : public QQuickImplicitSizeItemPrivate { Q_DECLARE_PUBLIC(QQuickTextEdit) @@ -122,7 +122,7 @@ public: QQuickItem* cursor; QQuickTextEdit::TextFormat format; QQuickTextDocumentWithImageResources *document; - QTextControl *control; + QQuickTextControl *control; QQuickTextEdit::WrapMode wrapMode; QQuickTextEdit::SelectionMode mouseSelectionMode; int lineCount; |