diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-01-31 13:58:44 +1000 |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-01-31 06:34:44 +0100 |
| commit | f973bb1730e1138f9c745d142c1f2f5d9c53b456 (patch) | |
| tree | c04bc36a5ae8fddf29e6fe37f55e3ec2af59de3f /src/declarative/graphicsitems/qdeclarativetextinput_p_p.h | |
| parent | dbf35e498db723ae9850686e462ec4f45bc7b67c (diff) | |
Fix compile failures.
Remove uses of QLineControl, QTextControl and QBool and forward
declared QGraphicsWidget.
Change-Id: Ic5184a1d5aebfb1100ad0e24444b6773f4e617e8
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput_p_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h index f968460d..ab916104 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h @@ -50,7 +50,7 @@ #include <QPointer> -#include <private/qlinecontrol_p.h> +#include <private/qwidgetlinecontrol_p.h> // // W A R N I N G @@ -70,7 +70,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeTextInputPrivate : public QDeclarativeImplic { Q_DECLARE_PUBLIC(QDeclarativeTextInput) public: - QDeclarativeTextInputPrivate() : control(new QLineControl), + QDeclarativeTextInputPrivate() : control(new QWidgetLineControl), color((QRgb)0), style(QDeclarativeText::Normal), styleColor((QRgb)0), hAlign(QDeclarativeTextInput::AlignLeft), mouseSelectionMode(QDeclarativeTextInput::SelectCharacters), inputMethodHints(Qt::ImhNone), @@ -110,7 +110,7 @@ public: bool sendMouseEventToInputContext(QGraphicsSceneMouseEvent *event, QEvent::Type eventType); void updateInputMethodHints(); - QLineControl* control; + QWidgetLineControl* control; QFont font; QFont sourceFont; |