summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2011-07-14 13:58:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-14 06:00:10 +0200
commit43c1477492ca990a975b86f8520a5345b52422a7 (patch)
treee6f6f14abfb8a9734847c18223a8703c3310937d
parent47db4be971b687c74d40b798c400c8ca99147aed (diff)
downloadqtlocation-43c1477492ca990a975b86f8520a5345b52422a7.tar.gz
Fixed build break
QDeclarativeItem was moved from QtDeclarative to QtQuick1 Change-Id: I4bdeaa63386874881f40856553842405c028fbb2 Reviewed-on: http://codereview.qt.nokia.com/1561 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
-rw-r--r--examples/declarative/flickr/flickr.pro2
-rw-r--r--examples/declarative/flickr/qmllocationflickr.cpp2
-rw-r--r--examples/declarative/landmarkmap/landmarkmap.pro2
-rw-r--r--examples/declarative/landmarkmap/qmllandmarkmap.cpp2
-rw-r--r--examples/declarative/mapviewer/mapviewer.pro2
-rw-r--r--examples/declarative/mapviewer/qmlmapviewer.cpp2
-rw-r--r--src/imports/location/location.pro2
-rw-r--r--src/imports/location/qdeclarativegeomapmousearea_p.h2
-rw-r--r--src/imports/location/qdeclarativegeomapobject_p.h2
-rw-r--r--src/imports/location/qdeclarativegeoserviceprovider_p.h2
-rw-r--r--src/imports/location/qdeclarativegraphicsgeomap_p.h2
11 files changed, 11 insertions, 11 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 ac651716..9478a19c 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/src/imports/location/location.pro b/src/imports/location/location.pro
index 6d72bdf1..e16c7fe5 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 += declarative qtquick1 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..a2068b25 100644
--- a/src/imports/location/qdeclarativegeomapobject_p.h
+++ b/src/imports/location/qdeclarativegeomapobject_p.h
@@ -47,7 +47,7 @@
#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"