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 /tools/qmlviewer | |
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 'tools/qmlviewer')
-rw-r--r-- | tools/qmlviewer/qdeclarativetester.cpp | 4 | ||||
-rw-r--r-- | tools/qmlviewer/qmlruntime.cpp | 2 | ||||
-rw-r--r-- | tools/qmlviewer/qmlviewer.pro | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tools/qmlviewer/qdeclarativetester.cpp b/tools/qmlviewer/qdeclarativetester.cpp index 9700e40cb7..842c3a369d 100644 --- a/tools/qmlviewer/qdeclarativetester.cpp +++ b/tools/qmlviewer/qdeclarativetester.cpp @@ -42,7 +42,7 @@ #include <qdeclarativetester.h> #include <QDebug> #include <QApplication> -#include <qdeclarativeview.h> +#include <QtQuick1/qdeclarativeview.h> #include <QFile> #include <QDeclarativeComponent> #include <QDir> @@ -50,7 +50,7 @@ #include <private/qabstractanimation_p.h> #include <QGraphicsObject> #ifndef Q_OS_SYMBIAN -#include <private/qdeclarativeitem_p.h> +#include <QtQuick1/private/qdeclarativeitem_p.h> #endif QT_BEGIN_NAMESPACE diff --git a/tools/qmlviewer/qmlruntime.cpp b/tools/qmlviewer/qmlruntime.cpp index 1ace146490..55f0f4f2bc 100644 --- a/tools/qmlviewer/qmlruntime.cpp +++ b/tools/qmlviewer/qmlruntime.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <qdeclarativeview.h> +#include <QtQuick1/qdeclarativeview.h> #ifdef hz #undef hz diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro index 87b5899fcc..e9edd605e6 100644 --- a/tools/qmlviewer/qmlviewer.pro +++ b/tools/qmlviewer/qmlviewer.pro @@ -1,6 +1,7 @@ TEMPLATE = app CONFIG += qt uic DESTDIR = ../../bin +QT += declarative qtquick1 qtquick1-private include(qml.pri) |