diff options
Diffstat (limited to 'src/plugins')
33 files changed, 119 insertions, 119 deletions
diff --git a/src/plugins/accessible/quick/main.cpp b/src/plugins/accessible/quick/main.cpp index af9555c690..6ff3d5db9e 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 add275a815..213d2e889b 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 diff --git a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro index c1ca2a5ef9..6f973bcc18 100644 --- a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro +++ b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro @@ -1,10 +1,10 @@ TARGET = qmldbg_ost -QT += declarative network +QT += qml network load(qt_plugin) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmltooling -QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" +QTDIR_build:REQUIRES += "contains(QT_CONFIG, qml)" SOURCES += \ qmlostplugin.cpp \ diff --git a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp index d4d9629334..9bd68e7401 100644 --- a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp +++ b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.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,7 +42,7 @@ #include "qmlostplugin.h" #include "qostdevice.h" -#include <private/qdeclarativedebugserver_p.h> +#include <private/qqmldebugserver_p.h> #include <private/qpacketprotocol_p.h> QT_BEGIN_NAMESPACE @@ -55,7 +55,7 @@ public: QOstDevice *ost; QPacketProtocol *protocol; - QDeclarativeDebugServer *debugServer; + QQmlDebugServer *debugServer; }; QmlOstPluginPrivate::QmlOstPluginPrivate() : @@ -75,7 +75,7 @@ QmlOstPlugin::~QmlOstPlugin() delete d_ptr; } -void QmlOstPlugin::setServer(QDeclarativeDebugServer *server) +void QmlOstPlugin::setServer(QQmlDebugServer *server) { Q_D(QmlOstPlugin); d->debugServer = server; @@ -127,12 +127,12 @@ void QmlOstPlugin::setPort(int port, bool block) if (!ok) { if (d->ost->errorString().length()) qDebug("Error from QOstDevice: %s", qPrintable(d->ost->errorString())); - qWarning("QDeclarativeDebugServer: Unable to listen on OST"); // This message is part of the signalling - do not change the format! + qWarning("QQmlDebugServer: Unable to listen on OST"); // This message is part of the signalling - do not change the format! return; } d->protocol = new QPacketProtocol(d->ost, this); QObject::connect(d->protocol, SIGNAL(readyRead()), this, SLOT(readyRead())); - qWarning("QDeclarativeDebugServer: Waiting for connection via OST"); // This message is part of the signalling - do not change the format! + qWarning("QQmlDebugServer: Waiting for connection via OST"); // This message is part of the signalling - do not change the format! } void QmlOstPlugin::readyRead() diff --git a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h index 1bbba93b94..41c3a07f25 100644 --- a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h +++ b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.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 @@ -43,26 +43,26 @@ #define QMLOSTPLUGIN_H #include <QtWidgets/QStylePlugin> -#include <QtDeclarative/private/qdeclarativedebugserverconnection_p.h> +#include <QtQml/private/qqmldebugserverconnection_p.h> QT_BEGIN_NAMESPACE -class QDeclarativeDebugServer; +class QQmlDebugServer; class QmlOstPluginPrivate; -class QmlOstPlugin : public QObject, public QDeclarativeDebugServerConnection +class QmlOstPlugin : public QObject, public QQmlDebugServerConnection { Q_OBJECT Q_DECLARE_PRIVATE(QmlOstPlugin) Q_DISABLE_COPY(QmlOstPlugin) - Q_INTERFACES(QDeclarativeDebugServerConnection) + Q_INTERFACES(QQmlDebugServerConnection) public: QmlOstPlugin(); ~QmlOstPlugin(); - void setServer(QDeclarativeDebugServer *server); + void setServer(QQmlDebugServer *server); void setPort(int port, bool bock); bool isConnected() const; diff --git a/src/plugins/qmltooling/qmldbg_ost/qostdevice.cpp b/src/plugins/qmltooling/qmldbg_ost/qostdevice.cpp index 289418cd83..2c557ac3cc 100644 --- a/src/plugins/qmltooling/qmldbg_ost/qostdevice.cpp +++ b/src/plugins/qmltooling/qmldbg_ost/qostdevice.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_ost/qostdevice.h b/src/plugins/qmltooling/qmldbg_ost/qostdevice.h index 609a71897b..4b645f9c8e 100644 --- a/src/plugins/qmltooling/qmldbg_ost/qostdevice.h +++ b/src/plugins/qmltooling/qmldbg_ost/qostdevice.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_ost/usbostcomm.h b/src/plugins/qmltooling/qmldbg_ost/usbostcomm.h index 246e162aee..b9bf53fbd2 100644 --- a/src/plugins/qmltooling/qmldbg_ost/usbostcomm.h +++ b/src/plugins/qmltooling/qmldbg_ost/usbostcomm.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/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 24efee8725..f0514134d1 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 OTHER_FILES += qtquick2plugin.json 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 1245a7e690..16dfaed597 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 f6f668d6b4..6c3f3d6943 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,18 +51,18 @@ class AbstractViewInspector; namespace QtQuick2 { -class QtQuick2Plugin : public QObject, public QDeclarativeInspectorInterface +class QtQuick2Plugin : public QObject, public QQmlInspectorInterface { Q_OBJECT Q_DISABLE_COPY(QtQuick2Plugin) - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeInspectorInterface" FILE "qtquick2plugin.json") - Q_INTERFACES(QDeclarativeInspectorInterface) + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlInspectorInterface" FILE "qtquick2plugin.json") + Q_INTERFACES(QQmlInspectorInterface) public: QtQuick2Plugin(); ~QtQuick2Plugin(); - // QDeclarativeInspectorInterface + // QQmlInspectorInterface bool canHandleView(QObject *view); void activate(QObject *view); void deactivate(); @@ -75,4 +75,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 diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index 075cc49ae5..0c5e196b18 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -1,12 +1,12 @@ load(qt_module) TARGET = qmldbg_tcp -QT += declarative-private network +QT += qml-private network load(qt_plugin) -DESTDIR = $$QT.declarative.plugins/qmltooling -QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" +DESTDIR = $$QT.qml.plugins/qmltooling +QTDIR_build:REQUIRES += "contains(QT_CONFIG, qml)" SOURCES += \ qtcpserverconnection.cpp diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp index 216c2c30b1..1c5ec37512 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp +++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.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 <QtNetwork/qtcpserver.h> #include <QtNetwork/qtcpsocket.h> -#include <private/qdeclarativedebugserver_p.h> +#include <private/qqmldebugserver_p.h> #include <private/qpacketprotocol_p.h> QT_BEGIN_NAMESPACE @@ -60,7 +60,7 @@ public: QPacketProtocol *protocol; QTcpServer *tcpServer; - QDeclarativeDebugServer *debugServer; + QQmlDebugServer *debugServer; }; QTcpServerConnectionPrivate::QTcpServerConnectionPrivate() : @@ -84,7 +84,7 @@ QTcpServerConnection::~QTcpServerConnection() delete d_ptr; } -void QTcpServerConnection::setServer(QDeclarativeDebugServer *server) +void QTcpServerConnection::setServer(QQmlDebugServer *server) { Q_D(QTcpServerConnection); d->debugServer = server; @@ -147,9 +147,9 @@ void QTcpServerConnection::listen() d->tcpServer = new QTcpServer(this); QObject::connect(d->tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection())); if (d->tcpServer->listen(QHostAddress::Any, d->port)) - qWarning("QDeclarativeDebugServer: Waiting for connection on port %d...", d->port); + qWarning("QQmlDebugServer: Waiting for connection on port %d...", d->port); else - qWarning("QDeclarativeDebugServer: Unable to listen on port %d", d->port); + qWarning("QQmlDebugServer: Unable to listen on port %d", d->port); } @@ -170,7 +170,7 @@ void QTcpServerConnection::newConnection() Q_D(QTcpServerConnection); if (d->socket && d->socket->peerPort()) { - qWarning("QDeclarativeDebugServer: Another client is already connected"); + qWarning("QQmlDebugServer: Another client is already connected"); QTcpSocket *faultyConnection = d->tcpServer->nextPendingConnection(); delete faultyConnection; return; @@ -190,7 +190,7 @@ void QTcpServerConnection::newConnection() void QTcpServerConnection::invalidPacket() { - qWarning("QDeclarativeDebugServer: Received a corrupted packet! Giving up ..."); + qWarning("QQmlDebugServer: Received a corrupted packet! Giving up ..."); } QT_END_NAMESPACE diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h index 1154a0aa25..e81c9f7f0f 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h +++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.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 @@ -43,25 +43,25 @@ #define QTCPSERVERCONNECTION_H #include <QtWidgets/QStylePlugin> -#include <QtDeclarative/private/qdeclarativedebugserverconnection_p.h> +#include <QtQml/private/qqmldebugserverconnection_p.h> QT_BEGIN_NAMESPACE -class QDeclarativeDebugServer; +class QQmlDebugServer; class QTcpServerConnectionPrivate; -class QTcpServerConnection : public QObject, public QDeclarativeDebugServerConnection +class QTcpServerConnection : public QObject, public QQmlDebugServerConnection { Q_OBJECT Q_DECLARE_PRIVATE(QTcpServerConnection) Q_DISABLE_COPY(QTcpServerConnection) - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeDebugServerConnection" FILE "qtcpserverconnection.json") - Q_INTERFACES(QDeclarativeDebugServerConnection) + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlDebugServerConnection" FILE "qtcpserverconnection.json") + Q_INTERFACES(QQmlDebugServerConnection) public: QTcpServerConnection(); ~QTcpServerConnection(); - void setServer(QDeclarativeDebugServer *server); + void setServer(QQmlDebugServer *server); void setPort(int port, bool bock); bool isConnected() const; 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 |