diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-07-11 13:47:51 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-12 06:38:09 +0200 |
| commit | 4442dea01b9d4d45964228ac442166d89f091f9e (patch) | |
| tree | 28ae20cb26967765a988b1ee522fc2d64d777671 /src/plugins | |
| parent | b119220da60453ecf31898f7a57eda9d3c4e9225 (diff) | |
Extract all QtQuick 1 elements into a separate library/plugin.
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/plugins')
5 files changed, 9 insertions, 4 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp index 6085d8131a..9b52de1c53 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp @@ -52,7 +52,7 @@ #include <QtGui/QAction> #include <QtGui/QGraphicsObject> -#include <QtDeclarative/QDeclarativeItem> +#include <QtQuick1/QDeclarativeItem> #include <QtDeclarative/QDeclarativeEngine> #include <QtCore/QDebug> diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp index 3351df9d0b..bef218ca6b 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp @@ -48,7 +48,10 @@ #include "editor/livelayeritem.h" #include "editor/boundingrecthighlighter.h" -#include <QtDeclarative/QDeclarativeItem> +#include <QtQuick1/QDeclarativeItem> +#include <QtDeclarative/QDeclarativeEngine> +#include <QtDeclarative/QDeclarativeContext> +#include <QtDeclarative/QDeclarativeExpression> #include <QtGui/QWidget> #include <QtGui/QMouseEvent> #include <QtGui/QGraphicsObject> diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h index c77cd2c522..1a1b167622 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h @@ -48,7 +48,7 @@ #include "abstractviewinspector.h" #include <QtCore/QScopedPointer> -#include <QtDeclarative/QDeclarativeView> +#include <QtQuick1/QDeclarativeView> namespace QmlJSDebugger { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h index bfa857cf41..a51f155404 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h @@ -44,6 +44,8 @@ #include "qdeclarativeviewinspector.h" +#include <QtCore/QScopedPointer> +#include <QtQuick1/QDeclarativeView> #include <QtCore/QWeakPointer> #include <QtCore/QPointF> diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 427a1779e3..7f4d54e53a 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -1,7 +1,7 @@ load(qt_module) TARGET = qmldbg_inspector -QT += declarative-private core-private gui-private opengl-private +QT += declarative-private core-private gui-private opengl-private qtquick1 load(qt_plugin) |