Build against new QtQuick2 library.

Edited-by: Alex Wilson <alex.wilson@nokia.com>
Change-Id: I0cebb40062f645665fa17048f04a5c5c78add0e6
Reviewed-by: David Laing <david.laing@nokia.com>

20 files changed, 38 insertions, 40 deletions

diff --git a/examples/declarative/flickr/flickr.pro b/examples/declarative/flickr/flickr.pro
index 99a89dc1..c23005af 100644
--- a/examples/declarative/flickr/flickr.pro
+++ b/examples/declarative/flickr/flickr.pro
@@ -1,7 +1,7 @@
 TEMPLATE=app
 TARGET = qml_location_flickr
 
-QT += declarative network location qtquick1
+QT += declarative quick network location
 SOURCES += qmllocationflickr.cpp
 
 RESOURCES += \
diff --git a/examples/declarative/flickr/qmllocationflickr.cpp b/examples/declarative/flickr/qmllocationflickr.cpp
index 27782e19..6d5ea5e8 100644
--- a/examples/declarative/flickr/qmllocationflickr.cpp
+++ b/examples/declarative/flickr/qmllocationflickr.cpp
@@ -38,13 +38,13 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
-#include <QtDeclarative/QQuickView>
+#include <QGuiApplication>
+#include <QtQuick/QQuickView>
 #include <QtDeclarative/QDeclarativeEngine>
 
 int main(int argc, char *argv[])
 {
-    QApplication application(argc, argv);
+    QGuiApplication application(argc, argv);
     const QString mainQmlApp = QLatin1String("qrc:///flickr.qml");
     QQuickView view;
     view.setSource(QUrl(mainQmlApp));
diff --git a/examples/declarative/mapviewer/mapviewerwrapper.pro b/examples/declarative/mapviewer/mapviewerwrapper.pro
index c454ef8b..37949448 100644
--- a/examples/declarative/mapviewer/mapviewerwrapper.pro
+++ b/examples/declarative/mapviewer/mapviewerwrapper.pro
@@ -1,7 +1,7 @@
 TARGET = qml_location_mapviewer
 TEMPLATE = app
 
-QT += declarative network
+QT += declarative network quick
 SOURCES += qmlmapviewerwrapper.cpp
 
 RESOURCES += \
diff --git a/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp b/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp
index 5bb08a5e..63b01c99 100644
--- a/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp
+++ b/examples/declarative/mapviewer/qmlmapviewerwrapper.cpp
@@ -37,15 +37,14 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+#include <QtCore/QStringList>
+#include <QtCore/QTextStream>
 #include <QtGui/QGuiApplication>
-#include <QtDeclarative/QQuickView>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QQuickItem>
-#include <QStringList>
-#include <QTextStream>
-
-
+#include <QtQuick/QQuickView>
+#include <QtQuick/QQuickItem>
 
 static bool parseArgs(QStringList& args, QVariantMap& parameters)
 {
diff --git a/examples/declarative/places/placeswrapper.pro b/examples/declarative/places/placeswrapper.pro
index 7f263cf6..0a716a80 100644
--- a/examples/declarative/places/placeswrapper.pro
+++ b/examples/declarative/places/placeswrapper.pro
@@ -1,7 +1,7 @@
 TARGET = qml_location_places
 TEMPLATE = app
 
-QT += declarative network
+QT += declarative quick network
 SOURCES += qmlplaceswrapper.cpp
 
 RESOURCES += \
diff --git a/examples/declarative/places/qmlplaceswrapper.cpp b/examples/declarative/places/qmlplaceswrapper.cpp
index 9e42c681..8a1bb4b8 100644
--- a/examples/declarative/places/qmlplaceswrapper.cpp
+++ b/examples/declarative/places/qmlplaceswrapper.cpp
@@ -38,13 +38,13 @@
 **
 ****************************************************************************/
 
+#include <QtCore/QStringList>
+#include <QtCore/QTextStream>
 #include <QtGui/QGuiApplication>
-#include <QtDeclarative/QQuickView>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QQuickItem>
-#include <QtCore/QStringList>
-#include <QtCore/QTextStream>
+#include <QtQuick/QQuickView>
+#include <QtQuick/QQuickItem>
 
 static bool parseArgs(QStringList& args, QVariantMap& parameters)
 {
diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro
index 6c0ac9d9..f1043a30 100644
--- a/src/imports/location/location.pro
+++ b/src/imports/location/location.pro
@@ -3,7 +3,7 @@ TARGETPATH = QtLocation
 
 include(qlocationimport.pri)
 
-QT += declarative-private network location qtquick1 declarative qt3d core-private gui-private
+QT += declarative quick-private network location declarative qt3d core-private gui-private
 
 DESTDIR = $$QT.location.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
diff --git a/src/imports/location/mapnode_p.h b/src/imports/location/mapnode_p.h
index 6c08b181..d80d8f80 100644
--- a/src/imports/location/mapnode_p.h
+++ b/src/imports/location/mapnode_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include <QSGGeometryNode>
-#include "qsgtexturematerial.h"
-#include "qglframebufferobjectsurface.h"
-#include <private/qsgtexture_p.h>
+#include <QtQuick/QSGNode>
+#include <QtQuick/QSGTextureMaterial>
+#include <QtQuick/private/qsgtexture_p.h>
+#include <Qt3D/QGLFramebufferObjectSurface>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index c6bccf87..e250f402 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -67,8 +67,8 @@
 #include <QDeclarativeContext>
 #include <QtDeclarative/qdeclarativeinfo.h>
 #include <QModelIndex>
-#include <QQuickCanvas>
-#include <QSGEngine>
+#include <QtQuick/QQuickCanvas>
+#include <QtQuick/QSGEngine>
 #include <QtGui/QGuiApplication>
 
 #include <QDebug>
diff --git a/src/imports/location/qdeclarativegeomap_p.h b/src/imports/location/qdeclarativegeomap_p.h
index 3b0939fd..f80fcdfc 100644
--- a/src/imports/location/qdeclarativegeomap_p.h
+++ b/src/imports/location/qdeclarativegeomap_p.h
@@ -44,13 +44,13 @@
 
 #include <QPointer>
 #include <QTouchEvent>
-#include <QtDeclarative/qquickitem.h>
+#include <QtQuick/QQuickItem>
 #include <QtCore/QMutex>
 
 #include <QtCore/QCoreApplication>
 
-#include "qsgtexture.h"
-#include "qquickpainteditem.h"
+#include <QtQuick/QSGTexture>
+#include <QtQuick/QQuickPaintedItem>
 #include "qdeclarativegeomapitemview_p.h"
 #include "qdeclarativegeomapflickable_p.h"
 #include "qdeclarativegeomappincharea_p.h"
diff --git a/src/imports/location/qdeclarativegeomapitembase_p.h b/src/imports/location/qdeclarativegeomapitembase_p.h
index ee2fc6d9..3c303493 100644
--- a/src/imports/location/qdeclarativegeomapitembase_p.h
+++ b/src/imports/location/qdeclarativegeomapitembase_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEGEOMAPITEMBASE_H
 #define QDECLARATIVEGEOMAPITEMBASE_H
 
-#include <QtDeclarative/qquickitem.h>
+#include <QtQuick/QQuickItem>
 
 #include "qdeclarativegeomap_p.h"
 #include "qdeclarativecoordinate_p.h"
diff --git a/src/imports/location/qdeclarativegeomapitemview_p.h b/src/imports/location/qdeclarativegeomapitemview_p.h
index 65735350..141cb3d9 100644
--- a/src/imports/location/qdeclarativegeomapitemview_p.h
+++ b/src/imports/location/qdeclarativegeomapitemview_p.h
@@ -44,7 +44,7 @@
 
 #include "QModelIndex"
 
-#include <QtDeclarative/QQuickItem>
+#include <QtQuick/QQuickItem>
 #include <QtCore/QPointer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp
index c29d749e..479f496a 100644
--- a/src/imports/location/qdeclarativegeomapmousearea.cpp
+++ b/src/imports/location/qdeclarativegeomapmousearea.cpp
@@ -42,9 +42,9 @@
 #include "qdeclarativegeomapmousearea_p.h"
 #include "qdeclarativegeomapitembase_p.h"
 #include <QtDeclarative/qdeclarativeinfo.h>
-#include <QtDeclarative/QQuickCanvas>
+#include <QtQuick/QQuickCanvas>
 
-#include <QtDeclarative/private/qquickevents_p_p.h>
+#include <QtQuick/private/qquickevents_p_p.h>
 
 #include <QDebug>
 
diff --git a/src/imports/location/qdeclarativegeomapmousearea_p.h b/src/imports/location/qdeclarativegeomapmousearea_p.h
index a12e2a61..a97c0b00 100644
--- a/src/imports/location/qdeclarativegeomapmousearea_p.h
+++ b/src/imports/location/qdeclarativegeomapmousearea_p.h
@@ -46,8 +46,8 @@
 #include "qdeclarativegeomap_p.h"
 #include "qdeclarativegeomapmouseevent_p.h"
 
-#include <QtDeclarative/QQuickItem>
-#include <QtDeclarative/private/qquickmousearea_p.h>
+#include <QtQuick/QQuickItem>
+#include <QtQuick/private/qquickmousearea_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeomapquickitem_p.h b/src/imports/location/qdeclarativegeomapquickitem_p.h
index e05f198b..b54d87f3 100644
--- a/src/imports/location/qdeclarativegeomapquickitem_p.h
+++ b/src/imports/location/qdeclarativegeomapquickitem_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEGEOMAPQUICKITEM_H
 #define QDECLARATIVEGEOMAPQUICKITEM_H
 
-#include <QtDeclarative/qquickitem.h>
+#include <QtQuick/QQuickItem>
 
 #include "qdeclarativegeomap_p.h"
 #include "qdeclarativecoordinate_p.h"
diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h
index 34121463..6a095c75 100644
--- a/src/imports/location/qdeclarativegeoserviceprovider_p.h
+++ b/src/imports/location/qdeclarativegeoserviceprovider_p.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVEQGEOSERVICEPROVIDER_H
 
 #include <qgeocoordinate.h>
-#include <QtDeclarative/QQuickItem>
+#include <QtQuick/QQuickItem>
 #include <QtLocation/QPlaceManager>
 
 #include <QMap>
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>