projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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/
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the Qt
Declarative
module of the Qt Toolkit.
+** This file is part of the Qt
Qml
module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@
-46,7
+46,7
@@
#include "qquicktext_p.h"
#include "qquickimplicitsizeitem_p_p.h"
#include "qquicktext_p.h"
#include "qquickimplicitsizeitem_p_p.h"
-#include <Qt
Declarative/qdeclarative
.h>
+#include <Qt
Qml/qqml
.h>
#include <QtCore/qelapsedtimer.h>
#include <QtCore/qpointer.h>
#include <QtCore/qbasictimer.h>
#include <QtCore/qelapsedtimer.h>
#include <QtCore/qpointer.h>
#include <QtCore/qbasictimer.h>
@@
-174,9
+174,9
@@
public:
QPointF pressPos;
QPointF tripleClickStartPoint;
QPointF pressPos;
QPointF tripleClickStartPoint;
- Q
DeclarativeGuard<QDeclarative
Component> cursorComponent;
+ Q
QmlGuard<QQml
Component> cursorComponent;
#ifndef QT_NO_VALIDATOR
#ifndef QT_NO_VALIDATOR
- Q
Declarative
Guard<QValidator> m_validator;
+ Q
Qml
Guard<QValidator> m_validator;
#endif
qreal hscroll;
#endif
qreal hscroll;