diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-11-10 14:19:32 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-12 12:56:20 +0100 |
| commit | 3f83388dba250778a265c4c6c35bd32679123832 (patch) | |
| tree | 5b482a9b436b35124982b3907eb095f794d35aff /src/quick/items/qquicktextinput_p_p.h | |
| parent | 6462526df9eff416c3ab1dcd111a3e7c7751615d (diff) | |
Create a copy of QLineControl in the QtDeclarative library.
First half of a move of QLineControl from qtbase to qtdeclarative, some
time in the future QLineControl will be deleted from qtbase to finish
the move.
Task-number: QTBUG-22627
Change-Id: I0c3449f57f1a3296a0ff52f2b9a1a78041ae28b2
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextinput_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextinput_p_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h index 900b0804bb..119df5fd39 100644 --- a/src/quick/items/qquicktextinput_p_p.h +++ b/src/quick/items/qquicktextinput_p_p.h @@ -47,7 +47,7 @@ #include "qquicktext_p.h" #include "qquickimplicitsizeitem_p_p.h" -#include <private/qlinecontrol_p.h> +#include "qquicklinecontrol_p.h" #include <QtDeclarative/qdeclarative.h> #include <QtCore/qelapsedtimer.h> @@ -75,7 +75,7 @@ class Q_AUTOTEST_EXPORT QQuickTextInputPrivate : public QQuickImplicitSizeItemPr Q_DECLARE_PUBLIC(QQuickTextInput) public: QQuickTextInputPrivate() - : control(new QLineControl(QString())) + : control(new QQuickLineControl(QString())) , color((QRgb)0) , style(QQuickText::Normal) , styleColor((QRgb)0) @@ -122,7 +122,7 @@ public: void hideCursor(); void showCursor(); - QLineControl* control; + QQuickLineControl* control; QFont font; QFont sourceFont; |