diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:13:42 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:14:33 +0100 |
| commit | d815621963cee5571ed93fb89561c4884a685b6b (patch) | |
| tree | 4c60b5f69eff56fd324e4203d006e1df677670ce /src/quick/items/qquicktextinput_p.h | |
| parent | 9b25a6f39ee59fe1bb4352a5f2e4ef4a91f1f2c3 (diff) | |
| parent | 471645f6dba6a21b85cb6788f0a0a07b6d5a804a (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
Diffstat (limited to 'src/quick/items/qquicktextinput_p.h')
| -rw-r--r-- | src/quick/items/qquicktextinput_p.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 83bc125dee..e66d9b4964 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -46,8 +46,6 @@ #include <QtGui/qtextoption.h> #include <QtGui/qvalidator.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickTextInputPrivate; @@ -334,9 +332,9 @@ protected: #endif void mouseUngrabEvent(); bool event(QEvent *e); + void focusOutEvent(QFocusEvent *event); void focusInEvent(QFocusEvent *event); void timerEvent(QTimerEvent *event); - virtual void itemChange(ItemChange, const ItemChangeData &); QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data); public Q_SLOTS: @@ -415,6 +413,4 @@ QML_DECLARE_TYPE(QQuickDoubleValidator) QML_DECLARE_TYPE(QRegExpValidator) #endif -QT_END_HEADER - #endif // QQUICKTEXTINPUT_P_H |