diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-12-13 09:40:44 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-13 02:42:08 +0100 |
| commit | 7ff9af19eed97384269d458d0dc676af22cc844e (patch) | |
| tree | 22395ede9da54da8849ce5e0233a97e4ea36f6d5 /tests/plugins | |
| parent | 52923d7f194fa7740e4bd9cbfb4a0ace4c18a131 (diff) | |
| download | qtlocation-7ff9af19eed97384269d458d0dc676af22cc844e.tar.gz | |
Build against new QtQuick2 library.
Edited-by: Alex Wilson <alex.wilson@nokia.com>
Change-Id: I0cebb40062f645665fa17048f04a5c5c78add0e6
Reviewed-by: David Laing <david.laing@nokia.com>
Diffstat (limited to 'tests/plugins')
4 files changed, 5 insertions, 6 deletions
diff --git a/tests/plugins/declarativetestplugin/declarativetestplugin.pro b/tests/plugins/declarativetestplugin/declarativetestplugin.pro index f5986904..26e18426 100644 --- a/tests/plugins/declarativetestplugin/declarativetestplugin.pro +++ b/tests/plugins/declarativetestplugin/declarativetestplugin.pro @@ -3,7 +3,7 @@ TARGETPATH = QtLocation/test include(../../../src/imports/location/qlocationimport.pri) -QT += declarative location widgets +QT += declarative quick location widgets DESTDIR = $$QT.location.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH diff --git a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h index 43c456b1..2fb2296f 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h +++ b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVELOCATIONTESTMODEL_H #define QDECLARATIVELOCATIONTESTMODEL_H -#include <QtDeclarative/QQuickItem> +#include <QtQuick/QQuickItem> #include <QAbstractListModel> #include <QTimer> #include <QDebug> diff --git a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp index 61555430..631e085b 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp +++ b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp @@ -41,8 +41,7 @@ #include "qdeclarativepinchgenerator_p.h" #include <QtWidgets/QApplication> -#include <qsgengine.h> - +#include <QtQuick/QSGEngine> QDeclarativePinchGenerator::QDeclarativePinchGenerator(): target_(0), diff --git a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h index 125af66a..4b9188ef 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h +++ b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVEPINCHGENERATOR_H #define QDECLARATIVEPINCHGENERATOR_H -#include <QtDeclarative/QQuickItem> -#include <QQuickCanvas> +#include <QtQuick/QQuickItem> +#include <QtQuick/QQuickCanvas> #include <QtGui/QMouseEvent> #include <QtGui/QTouchEvent> #include <QtGui/QKeyEvent> |