Merge master <-> api_changes

[profile/ivi/qtdeclarative.git] / src / quick / items / qquicktextinput_p_p.h

diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h
index 1921451..9a59b44 100644 (file)
--- a/src/quick/items/qquicktextinput_p_p.h
+++ b/src/quick/items/qquicktextinput_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -46,7 +46,7 @@
 #include "qquicktext_p.h"
 #include "qquickimplicitsizeitem_p_p.h"
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qpointer.h>
 #include <QtCore/qbasictimer.h>
@@ -174,9 +174,9 @@ public:
     QPointF pressPos;
     QPointF tripleClickStartPoint;
 
-    QDeclarativeGuard<QDeclarativeComponent> cursorComponent;
+    QQmlGuard<QQmlComponent> cursorComponent;
 #ifndef QT_NO_VALIDATOR
-    QDeclarativeGuard<QValidator> m_validator;
+    QQmlGuard<QValidator> m_validator;
 #endif
 
     qreal hscroll;