Fix build after introduction of QtQuick1.

Change-Id: I3e5ec450a1cfcabdab98b897ebaf12839030bd50
Reviewed-on: http://codereview.qt.nokia.com/1620
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: abcd <qt_abcd1@ovi.com>

12 files changed, 13 insertions, 12 deletions

diff --git a/examples/declarative/flickr/flickr.pro b/examples/declarative/flickr/flickr.pro
index 85401ca2..422a3538 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
+QT += qtquick1 declarative network location
 SOURCES += qmllocationflickr.cpp
 
 symbian {
diff --git a/examples/declarative/flickr/qmllocationflickr.cpp b/examples/declarative/flickr/qmllocationflickr.cpp
index 45a36f93..047b4008 100644
--- a/examples/declarative/flickr/qmllocationflickr.cpp
+++ b/examples/declarative/flickr/qmllocationflickr.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/QDeclarativeView>
+#include <QtQuick1/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeEngine>
 
 int main(int argc, char *argv[])
diff --git a/examples/declarative/landmarkmap/landmarkmap.pro b/examples/declarative/landmarkmap/landmarkmap.pro
index 623658a3..89c3ca23 100644
--- a/examples/declarative/landmarkmap/landmarkmap.pro
+++ b/examples/declarative/landmarkmap/landmarkmap.pro
@@ -1,7 +1,7 @@
 TEMPLATE=app
 TARGET = qml_location_landmarkmap
 
-QT += declarative network location
+QT += qtquick1 declarative network location
 
 SOURCES += qmllandmarkmap.cpp
 
diff --git a/examples/declarative/landmarkmap/qmllandmarkmap.cpp b/examples/declarative/landmarkmap/qmllandmarkmap.cpp
index 5dd2d900..25bf4055 100644
--- a/examples/declarative/landmarkmap/qmllandmarkmap.cpp
+++ b/examples/declarative/landmarkmap/qmllandmarkmap.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/QDeclarativeView>
+#include <QtQuick1/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QDir>
 
diff --git a/examples/declarative/mapviewer/mapviewer.pro b/examples/declarative/mapviewer/mapviewer.pro
index 5d931a8e..adc53344 100644
--- a/examples/declarative/mapviewer/mapviewer.pro
+++ b/examples/declarative/mapviewer/mapviewer.pro
@@ -1,7 +1,7 @@
 TARGET = qml_location_mapviewer
 TEMPLATE=app
 
-QT += declarative network
+QT += qtquick1 declarative network
 SOURCES += qmlmapviewer.cpp
 
 symbian {
diff --git a/examples/declarative/mapviewer/qmlmapviewer.cpp b/examples/declarative/mapviewer/qmlmapviewer.cpp
index 86b29f47..bd2725e8 100644
--- a/examples/declarative/mapviewer/qmlmapviewer.cpp
+++ b/examples/declarative/mapviewer/qmlmapviewer.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/QDeclarativeView>
+#include <QtQuick1/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QNetworkProxy>
 
diff --git a/examples/declarative/qmlplaces/qmlplaces.pro b/examples/declarative/qmlplaces/qmlplaces.pro
index 82ffddb0..c79b3d71 100644
--- a/examples/declarative/qmlplaces/qmlplaces.pro
+++ b/examples/declarative/qmlplaces/qmlplaces.pro
@@ -1,4 +1,4 @@
-QT       += core network declarative
+QT       += core network declarative qtquick1
 
 TARGET = qmlplaces
 
diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro
index b6515fd1..beb7d1f1 100644
--- a/src/imports/location/location.pro
+++ b/src/imports/location/location.pro
@@ -6,7 +6,7 @@ TARGETPATH = Qt/location
 
 include(qlocationimport.pri)
 
-QT += declarative network location
+QT += qtquick1 declarative network location
 
 DESTDIR = $$QT.location.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
diff --git a/src/imports/location/qdeclarativegeomapmousearea_p.h b/src/imports/location/qdeclarativegeomapmousearea_p.h
index 92174ab1..3a2d775e 100644
--- a/src/imports/location/qdeclarativegeomapmousearea_p.h
+++ b/src/imports/location/qdeclarativegeomapmousearea_p.h
@@ -46,7 +46,7 @@
 #include "qdeclarativegraphicsgeomap_p.h"
 #include "qdeclarativegeomapmouseevent_p.h"
 
-#include <QtDeclarative/qdeclarativeitem.h>
+#include <QtQuick1/qdeclarativeitem.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/location/qdeclarativegeomapobject_p.h b/src/imports/location/qdeclarativegeomapobject_p.h
index 26904dfd..acc603ba 100644
--- a/src/imports/location/qdeclarativegeomapobject_p.h
+++ b/src/imports/location/qdeclarativegeomapobject_p.h
@@ -47,7 +47,8 @@
 #include "qgeomapgroupobject.h"
 #include "QModelIndex"
 
-#include <QtDeclarative/qdeclarativeitem.h>
+#include <QtQuick1/qdeclarativeitem.h>
+
 class QAbstractItemModel;
 
 QT_BEGIN_NAMESPACE
diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h
index ecab2601..0c377ae3 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/qdeclarativeitem.h>
+#include <QtQuick1/qdeclarativeitem.h>
 
 #include <QMap>
 #include <QString>
diff --git a/src/imports/location/qdeclarativegraphicsgeomap_p.h b/src/imports/location/qdeclarativegraphicsgeomap_p.h
index 603d8270..5b217ed5 100644
--- a/src/imports/location/qdeclarativegraphicsgeomap_p.h
+++ b/src/imports/location/qdeclarativegraphicsgeomap_p.h
@@ -44,7 +44,7 @@
 
 #include <qgraphicsgeomap.h>
 #include <QPointer>
-#include <QtDeclarative/qdeclarativeitem.h>
+#include <QtQuick1/qdeclarativeitem.h>
 
 #include "qdeclarativegeomapobject_p.h"