9 files changed, 31 insertions, 31 deletions
diff --git a/src/plugins/accessible/quick/main.cpp b/src/plugins/accessible/quick/main.cpp
index 08a5fe546b..783d4674da 100644
--- a/src/plugins/accessible/quick/main.cpp
+++ b/src/plugins/accessible/quick/main.cpp
@@ -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
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 
-#include "qdeclarativeaccessible.h"
+#include "qqmlaccessible.h"
 #include "qaccessiblequickview.h"
 #include "qaccessiblequickitem.h"
 
diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.cpp b/src/plugins/accessible/quick/qaccessiblequickitem.cpp
index 806a0f50c8..78e7ca86ef 100644
--- a/src/plugins/accessible/quick/qaccessiblequickitem.cpp
+++ b/src/plugins/accessible/quick/qaccessiblequickitem.cpp
@@ -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
@@ -47,7 +47,7 @@
 QT_BEGIN_NAMESPACE
 
 QAccessibleQuickItem::QAccessibleQuickItem(QQuickItem *item)
-    : QDeclarativeAccessible(item)
+    : QQmlAccessible(item)
 {
 }
 
diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.h b/src/plugins/accessible/quick/qaccessiblequickitem.h
index a283f853fd..5c19666f32 100644
--- a/src/plugins/accessible/quick/qaccessiblequickitem.h
+++ b/src/plugins/accessible/quick/qaccessiblequickitem.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
@@ -44,13 +44,13 @@
 
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QQuickView>
-#include "qdeclarativeaccessible.h"
+#include "qqmlaccessible.h"
 
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_ACCESSIBILITY
 
-class QAccessibleQuickItem : public QDeclarativeAccessible
+class QAccessibleQuickItem : public QQmlAccessible
 {
 public:
     QAccessibleQuickItem(QQuickItem *item);
diff --git a/src/plugins/accessible/quick/qaccessiblequickview.cpp b/src/plugins/accessible/quick/qaccessiblequickview.cpp
index 05f0b8eed9..042d8dcf06 100644
--- a/src/plugins/accessible/quick/qaccessiblequickview.cpp
+++ b/src/plugins/accessible/quick/qaccessiblequickview.cpp
@@ -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
@@ -45,7 +45,7 @@
 #include <QtQuick/private/qquickitem_p.h>
 
 #include "qaccessiblequickitem.h"
-#include "qdeclarativeaccessible.h"
+#include "qqmlaccessible.h"
 
 #ifndef QT_NO_ACCESSIBILITY
 
diff --git a/src/plugins/accessible/quick/qaccessiblequickview.h b/src/plugins/accessible/quick/qaccessiblequickview.h
index 66c8a52168..3ad87df937 100644
--- a/src/plugins/accessible/quick/qaccessiblequickview.h
+++ b/src/plugins/accessible/quick/qaccessiblequickview.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
diff --git a/src/plugins/accessible/quick/quick.pro b/src/plugins/accessible/quick/quick.pro
index 97a1d50098..ae6ec032da 100644
--- a/src/plugins/accessible/quick/quick.pro
+++ b/src/plugins/accessible/quick/quick.pro
@@ -4,7 +4,7 @@ TARGET  = qtaccessiblequick
 load(qt_plugin)
 include ($$PWD/../shared/qaccessiblebase.pri)
 
-QT += core-private gui-private v8-private declarative-private quick-private
+QT += core-private gui-private v8-private qml-private quick-private
 DESTDIR = $$QT.gui.plugins/accessible
 
 QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)"
diff --git a/src/plugins/accessible/shared/qaccessiblebase.pri b/src/plugins/accessible/shared/qaccessiblebase.pri
index 8c82705443..56a8a1c9ef 100644
--- a/src/plugins/accessible/shared/qaccessiblebase.pri
+++ b/src/plugins/accessible/shared/qaccessiblebase.pri
@@ -3,5 +3,5 @@ INSTALLS        += target
 
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
-SOURCES += $$PWD/qdeclarativeaccessible.cpp
-HEADERS += $$PWD/qdeclarativeaccessible.h
+SOURCES += $$PWD/qqmlaccessible.cpp
+HEADERS += $$PWD/qqmlaccessible.h
diff --git a/src/plugins/accessible/shared/qdeclarativeaccessible.cpp b/src/plugins/accessible/shared/qqmlaccessible.cpp
index a063dd043d..1818ebebfe 100644
--- a/src/plugins/accessible/shared/qdeclarativeaccessible.cpp
+++ b/src/plugins/accessible/shared/qqmlaccessible.cpp
@@ -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
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qnamespace.h>
-#include "qdeclarativeaccessible.h"
+#include "qqmlaccessible.h"
 
 #ifndef QT_NO_ACCESSIBILITY
 
@@ -54,16 +54,16 @@ QString Q_GUI_EXPORT qTextAtOffsetFromString(int offset, QAccessible2::BoundaryT
 QString Q_GUI_EXPORT qTextAfterOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
         int *startOffset, int *endOffset, const QString& text);
 
-QDeclarativeAccessible::QDeclarativeAccessible(QObject *object)
+QQmlAccessible::QQmlAccessible(QObject *object)
     :QAccessibleObject(object)
 {
 }
 
-QDeclarativeAccessible::~QDeclarativeAccessible()
+QQmlAccessible::~QQmlAccessible()
 {
 }
 
-QAccessibleInterface *QDeclarativeAccessible::childAt(int x, int y) const
+QAccessibleInterface *QQmlAccessible::childAt(int x, int y) const
 {
     // Note that this function will disregard stacking order.
     // (QAccessibleQuickView::childAt() does this correctly and more efficient)
@@ -85,7 +85,7 @@ QAccessibleInterface *QDeclarativeAccessible::childAt(int x, int y) const
     return 0;
 }
 
-QAccessible::State QDeclarativeAccessible::state() const
+QAccessible::State QQmlAccessible::state() const
 {
     QAccessible::State state;
 
@@ -122,7 +122,7 @@ QAccessible::State QDeclarativeAccessible::state() const
     return state;
 }
 
-QStringList QDeclarativeAccessible::actionNames() const
+QStringList QQmlAccessible::actionNames() const
 {
     QStringList actions;
     switch (role()) {
@@ -139,7 +139,7 @@ QStringList QDeclarativeAccessible::actionNames() const
     return actions;
 }
 
-void QDeclarativeAccessible::doAction(const QString &actionName)
+void QQmlAccessible::doAction(const QString &actionName)
 {
     if (role() == QAccessible::PushButton && actionName == QAccessibleActionInterface::pressAction()) {
         QMetaObject::invokeMethod(object(), "accessibleAction");
@@ -150,7 +150,7 @@ void QDeclarativeAccessible::doAction(const QString &actionName)
     }
 }
 
-QStringList QDeclarativeAccessible::keyBindingsForAction(const QString &actionName) const
+QStringList QQmlAccessible::keyBindingsForAction(const QString &actionName) const
 {
     Q_UNUSED(actionName)
     return QStringList();
diff --git a/src/plugins/accessible/shared/qdeclarativeaccessible.h b/src/plugins/accessible/shared/qqmlaccessible.h
index 924e454fc9..570a3c8c40 100644
--- a/src/plugins/accessible/shared/qdeclarativeaccessible.h
+++ b/src/plugins/accessible/shared/qqmlaccessible.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
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEACCESSIBLE_H
-#define QDECLARATIVEACCESSIBLE_H
+#ifndef QQMLACCESSIBLE_H
+#define QQMLACCESSIBLE_H
 
 #include <QtGui/qaccessibleobject.h>
 #include <QtGui/qaccessible2.h>
 //#include <QtQuick1/qdeclarativeview.h>
 //#include <QtQuick1/qdeclarativeitem.h>
-#include <QtDeclarative/qdeclarativeproperty.h>
+#include <QtQml/qqmlproperty.h>
 
 //#include <private/qdeclarativeaccessible_p.h>
 
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
     * Item interface classes:
     QAccessibleDeclarativeItem for QtQuick1
     QAccessibleQuickItem for for QtQuick2
-    Common base class: QDeclarativeAccessible
+    Common base class: QQmlAccessible
 
     * View interface classes.
 
@@ -70,10 +70,10 @@ QT_BEGIN_NAMESPACE
     QAccessbileQuickView is the root for the SceneGraph implementation
 
 */
-class QDeclarativeAccessible: public QAccessibleObject, public QAccessibleActionInterface
+class QQmlAccessible: public QAccessibleObject, public QAccessibleActionInterface
 {
 public:
-    ~QDeclarativeAccessible();
+    ~QQmlAccessible();
 
     virtual QRect viewRect() const = 0;
     QAccessibleInterface *childAt(int, int) const;
@@ -86,11 +86,11 @@ public:
 protected:
     virtual bool clipsChildren() const = 0;
     // For subclasses, use instantiateObject factory method outside the class.
-    QDeclarativeAccessible(QObject *object);
+    QQmlAccessible(QObject *object);
 };
 
 #endif // QT_NO_ACCESSIBILITY
 
 QT_END_NAMESPACE
 
-#endif // QDECLARATIVEACCESSIBLE_H
+#endif // QQMLACCESSIBLE_H