From 43c1477492ca990a975b86f8520a5345b52422a7 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 14 Jul 2011 13:58:13 +1000 Subject: 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 Reviewed-by: Aaron McCarthy --- examples/declarative/flickr/flickr.pro | 2 +- examples/declarative/flickr/qmllocationflickr.cpp | 2 +- examples/declarative/landmarkmap/landmarkmap.pro | 2 +- examples/declarative/landmarkmap/qmllandmarkmap.cpp | 2 +- examples/declarative/mapviewer/mapviewer.pro | 2 +- examples/declarative/mapviewer/qmlmapviewer.cpp | 2 +- src/imports/location/location.pro | 2 +- src/imports/location/qdeclarativegeomapmousearea_p.h | 2 +- src/imports/location/qdeclarativegeomapobject_p.h | 2 +- src/imports/location/qdeclarativegeoserviceprovider_p.h | 2 +- src/imports/location/qdeclarativegraphicsgeomap_p.h | 2 +- 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 -#include +#include #include 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 -#include +#include #include #include 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 -#include +#include #include #include 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 +#include 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 +#include 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 -#include +#include #include #include 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 #include -#include +#include #include "qdeclarativegeomapobject_p.h" -- cgit v1.2.1