diff options
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_qtquick2')
9 files changed, 22 insertions, 22 deletions
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp index e0662da590..bb4048ee92 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.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/qmldbg_qtquick2/highlight.h b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h index 82096c6abd..1b1f10c8bb 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h +++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.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/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro index b9c6584afc..014f964652 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro @@ -1,11 +1,11 @@ load(qt_module) TARGET = qmldbg_qtquick2 -QT += declarative-private quick-private core-private gui-private opengl-private v8-private +QT += qml-private quick-private core-private gui-private opengl-private v8-private load(qt_plugin) -DESTDIR = $$QT.declarative.plugins/qmltooling +DESTDIR = $$QT.qml.plugins/qmltooling INCLUDEPATH *= $$PWD $$PWD/../shared @@ -24,7 +24,7 @@ HEADERS += \ qquickviewinspector.h \ ../shared/abstracttool.h \ ../shared/abstractviewinspector.h \ - ../shared/qdeclarativeinspectorprotocol.h \ + ../shared/qqmlinspectorprotocol.h \ ../shared/qmlinspectorconstants.h target.path += $$[QT_INSTALL_PLUGINS]/qmltooling diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp index b146c6e846..200c66ee35 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.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 @@ -41,7 +41,7 @@ #include "qquickviewinspector.h" -#include "qdeclarativeinspectorprotocol.h" +#include "qqmlinspectorprotocol.h" #include "highlight.h" #include "selectiontool.h" @@ -206,7 +206,7 @@ void QQuickViewInspector::setWindowFlags(Qt::WindowFlags flags) w->setVisible(true); } -QDeclarativeEngine *QQuickViewInspector::declarativeEngine() const +QQmlEngine *QQuickViewInspector::declarativeEngine() const { return m_view->engine(); } diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h index 07c38b1d5e..fbc3c17b87 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.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 @@ -71,7 +71,7 @@ public: void changeTool(InspectorProtocol::Tool tool); Qt::WindowFlags windowFlags() const; void setWindowFlags(Qt::WindowFlags flags); - QDeclarativeEngine *declarativeEngine() const; + QQmlEngine *declarativeEngine() const; QQuickView *view() const { return m_view; } QQuickItem *overlay() const { return m_overlay; } diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp index 206d0b2eb9..ea52788896 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.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 @@ -43,7 +43,7 @@ #include "qquickviewinspector.h" #include <QtCore/qplugin.h> -#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h> +#include <QtQml/private/qqmlinspectorservice_p.h> #include <QtQuick/QQuickView> namespace QmlJSDebugger { diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h index d0f814c03c..d78aac6ead 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.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,11 +39,11 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVEINSPECTORPLUGIN_H -#define QDECLARATIVEINSPECTORPLUGIN_H +#ifndef QTQUICK2PLUGINPLUGIN_H +#define QTQUICK2PLUGINPLUGIN_H #include <QtCore/QPointer> -#include <QtDeclarative/private/qdeclarativeinspectorinterface_p.h> +#include <QtQml/private/qqmlinspectorinterface_p.h> namespace QmlJSDebugger { @@ -51,17 +51,17 @@ class AbstractViewInspector; namespace QtQuick2 { -class QtQuick2Plugin : public QObject, public QDeclarativeInspectorInterface +class QtQuick2Plugin : public QObject, public QQmlInspectorInterface { Q_OBJECT Q_DISABLE_COPY(QtQuick2Plugin) - Q_INTERFACES(QDeclarativeInspectorInterface) + Q_INTERFACES(QQmlInspectorInterface) public: QtQuick2Plugin(); ~QtQuick2Plugin(); - // QDeclarativeInspectorInterface + // QQmlInspectorInterface bool canHandleView(QObject *view); void activate(QObject *view); void deactivate(); @@ -74,4 +74,4 @@ private: } // namespace QtQuick2 } // namespace QmlJSDebugger -#endif // QDECLARATIVEINSPECTORPLUGIN_H +#endif // QTQUICK2PLUGINPLUGIN_H diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.cpp index efa079dcf1..5ad102a92d 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.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/qmldbg_qtquick2/selectiontool.h b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.h index 7767317abe..c2aa26a1a7 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.h +++ b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.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 |