6 files changed, 30 insertions, 30 deletions
diff --git a/src/plugins/qmltooling/shared/abstracttool.cpp b/src/plugins/qmltooling/shared/abstracttool.cpp
index 0565537cca..69e468bd92 100644
--- a/src/plugins/qmltooling/shared/abstracttool.cpp
+++ b/src/plugins/qmltooling/shared/abstracttool.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
diff --git a/src/plugins/qmltooling/shared/abstracttool.h b/src/plugins/qmltooling/shared/abstracttool.h
index e21e3be1f8..35817064e2 100644
--- a/src/plugins/qmltooling/shared/abstracttool.h
+++ b/src/plugins/qmltooling/shared/abstracttool.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/qmltooling/shared/abstractviewinspector.cpp b/src/plugins/qmltooling/shared/abstractviewinspector.cpp
index cfa0f441cd..33e47d270d 100644
--- a/src/plugins/qmltooling/shared/abstractviewinspector.cpp
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.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
@@ -42,12 +42,12 @@
 #include "abstractviewinspector.h"
 
 #include "abstracttool.h"
-#include "qdeclarativeinspectorprotocol.h"
+#include "qqmlinspectorprotocol.h"
 
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeComponent>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlComponent>
 #include <QtCore/private/qabstractanimation_p.h>
-#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h>
+#include <QtQml/private/qqmlinspectorservice_p.h>
 
 #include <QtGui/QMouseEvent>
 
@@ -61,7 +61,7 @@ AbstractViewInspector::AbstractViewInspector(QObject *parent) :
     m_designModeBehavior(false),
     m_animationPaused(false),
     m_slowDownFactor(1.0),
-    m_debugService(QDeclarativeInspectorService::instance())
+    m_debugService(QQmlInspectorService::instance())
 {
 }
 
@@ -78,8 +78,8 @@ void AbstractViewInspector::createQmlObject(const QString &qml, QObject *parent,
         imports += QLatin1Char('\n');
     }
 
-    QDeclarativeContext *parentContext = declarativeEngine()->contextForObject(parent);
-    QDeclarativeComponent component(declarativeEngine());
+    QQmlContext *parentContext = declarativeEngine()->contextForObject(parent);
+    QQmlComponent component(declarativeEngine());
     QByteArray constructedQml = QString(imports + qml).toLatin1();
 
     component.setData(constructedQml, QUrl::fromLocalFile(filename));
@@ -316,7 +316,7 @@ void AbstractViewInspector::handleMessage(const QByteArray &message)
         for (int i = 0; i < itemCount; ++i) {
             int debugId = -1;
             ds >> debugId;
-            if (QObject *obj = QDeclarativeDebugService::objectForId(debugId))
+            if (QObject *obj = QQmlDebugService::objectForId(debugId))
                 selectedObjects << obj;
         }
 
@@ -363,22 +363,22 @@ void AbstractViewInspector::handleMessage(const QByteArray &message)
         QString filename;
         QStringList imports;
         ds >> qml >> parentId >> imports >> filename;
-        createQmlObject(qml, QDeclarativeDebugService::objectForId(parentId),
+        createQmlObject(qml, QQmlDebugService::objectForId(parentId),
                         imports, filename);
         break;
     }
     case InspectorProtocol::DestroyObject: {
         int debugId;
         ds >> debugId;
-        if (QObject *obj = QDeclarativeDebugService::objectForId(debugId))
+        if (QObject *obj = QQmlDebugService::objectForId(debugId))
             obj->deleteLater();
         break;
     }
     case InspectorProtocol::MoveObject: {
         int debugId, newParent;
         ds >> debugId >> newParent;
-        reparentQmlObject(QDeclarativeDebugService::objectForId(debugId),
-                          QDeclarativeDebugService::objectForId(newParent));
+        reparentQmlObject(QQmlDebugService::objectForId(debugId),
+                          QQmlDebugService::objectForId(newParent));
         break;
     }
     case InspectorProtocol::ObjectIdList: {
@@ -424,7 +424,7 @@ void AbstractViewInspector::sendCurrentObjects(const QList<QObject*> &objects)
        << objects.length();
 
     foreach (QObject *object, objects) {
-        int id = QDeclarativeDebugService::idForObject(object);
+        int id = QQmlDebugService::idForObject(object);
         ds << id;
     }
 
@@ -497,7 +497,7 @@ void AbstractViewInspector::sendColorChanged(const QColor &color)
 
 QString AbstractViewInspector::idStringForObject(QObject *obj) const
 {
-    const int id = QDeclarativeDebugService::idForObject(obj);
+    const int id = QQmlDebugService::idForObject(obj);
     return m_stringIdForObjectId.value(id);
 }
 
diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.h b/src/plugins/qmltooling/shared/abstractviewinspector.h
index 741013239f..0dacc92233 100644
--- a/src/plugins/qmltooling/shared/abstractviewinspector.h
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.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
@@ -47,12 +47,12 @@
 #include <QtCore/QStringList>
 #include <QtGui/QColor>
 
-#include "qdeclarativeinspectorprotocol.h"
+#include "qqmlinspectorprotocol.h"
 #include "qmlinspectorconstants.h"
 
 QT_BEGIN_NAMESPACE
-class QDeclarativeEngine;
-class QDeclarativeInspectorService;
+class QQmlEngine;
+class QQmlInspectorService;
 class QKeyEvent;
 class QMouseEvent;
 class QWheelEvent;
@@ -63,7 +63,7 @@ namespace QmlJSDebugger {
 class AbstractTool;
 
 /*
- * The common code between QQuickView and QDeclarativeView inspectors lives here,
+ * The common code between QQuickView and QQuickView inspectors lives here,
  */
 class AbstractViewInspector : public QObject
 {
@@ -100,7 +100,7 @@ public:
     virtual void changeTool(InspectorProtocol::Tool tool) = 0;
     virtual Qt::WindowFlags windowFlags() const = 0;
     virtual void setWindowFlags(Qt::WindowFlags flags) = 0;
-    virtual QDeclarativeEngine *declarativeEngine() const = 0;
+    virtual QQmlEngine *declarativeEngine() const = 0;
 
 signals:
     void designModeBehaviorChanged(bool inDesignMode);
@@ -159,7 +159,7 @@ private:
     qreal m_slowDownFactor;
 
     QHash<int, QString> m_stringIdForObjectId;
-    QDeclarativeInspectorService *m_debugService;
+    QQmlInspectorService *m_debugService;
 };
 
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/shared/qmlinspectorconstants.h b/src/plugins/qmltooling/shared/qmlinspectorconstants.h
index 1b25486bb6..e5a0ee5450 100644
--- a/src/plugins/qmltooling/shared/qmlinspectorconstants.h
+++ b/src/plugins/qmltooling/shared/qmlinspectorconstants.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
@@ -42,7 +42,7 @@
 #ifndef QMLINSPECTORCONSTANTS_H
 #define QMLINSPECTORCONSTANTS_H
 
-#include <QtDeclarative/private/qdeclarativeglobal_p.h>
+#include <QtQml/private/qqmlglobal_p.h>
 
 namespace QmlJSDebugger {
 namespace Constants {
diff --git a/src/plugins/qmltooling/shared/qdeclarativeinspectorprotocol.h b/src/plugins/qmltooling/shared/qqmlinspectorprotocol.h
index 4c833b99dc..63772aa8e4 100644
--- a/src/plugins/qmltooling/shared/qdeclarativeinspectorprotocol.h
+++ b/src/plugins/qmltooling/shared/qqmlinspectorprotocol.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,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEINSPECTORPROTOCOL_H
-#define QDECLARATIVEINSPECTORPROTOCOL_H
+#ifndef QQMLINSPECTORPROTOCOL_H
+#define QQMLINSPECTORPROTOCOL_H
 
 #include <QtCore/QDebug>
 #include <QtCore/QMetaType>
@@ -134,4 +134,4 @@ inline QDebug operator<< (QDebug dbg, InspectorProtocol::Tool tool)
 
 } // namespace QmlJSDebugger
 
-#endif // QDECLARATIVEINSPECTORPROTOCOL_H
+#endif // QQMLINSPECTORPROTOCOL_H