diff options
| author | David Laing <david.laing@nokia.com> | 2011-10-18 15:32:08 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 08:17:16 +0200 |
| commit | 114a78616d5efdc3d8c3d93dcf6ba3bb624cd4a3 (patch) | |
| tree | b464695387d5be2dd41d75507e8c53c12346b585 /src/imports | |
| parent | 55aa1efdfc1043381cff3ab30581de9ab587762a (diff) | |
| download | qtlocation-114a78616d5efdc3d8c3d93dcf6ba3bb624cd4a3.tar.gz | |
Build/compile fixes for Qt Location.
Updates several .pro files to reflect the change of Qt3D from a
"CONFIG" inclusion to a "QT" inclusion.
Also fixes various compile errors brought about by the inclusion
of headers from modules we don't use.
Change-Id: Ibf1b93d6ee474c24ece0b84ffca36f47aca8cc90
Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/location/location.pro | 3 | ||||
| -rw-r--r-- | src/imports/location/qdeclarative3dgraphicsgeomap.cpp | 3 | ||||
| -rw-r--r-- | src/imports/location/qdeclarativegeomapflickable.cpp | 1 | ||||
| -rw-r--r-- | src/imports/location/qdeclarativeposition.cpp | 1 | ||||
| -rw-r--r-- | src/imports/location/qdeclarativepositionsource.cpp | 1 |
5 files changed, 1 insertions, 8 deletions
diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro index aa16bbb5..1ebd7810 100644 --- a/src/imports/location/location.pro +++ b/src/imports/location/location.pro @@ -3,8 +3,7 @@ TARGETPATH = QtLocation include(qlocationimport.pri) -QT += declarative-private network location qtquick1 declarative -CONFIG += qt3d +QT += declarative-private network location qtquick1 declarative qt3d DESTDIR = $$QT.location.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH diff --git a/src/imports/location/qdeclarative3dgraphicsgeomap.cpp b/src/imports/location/qdeclarative3dgraphicsgeomap.cpp index b46db2c1..9b72a54f 100644 --- a/src/imports/location/qdeclarative3dgraphicsgeomap.cpp +++ b/src/imports/location/qdeclarative3dgraphicsgeomap.cpp @@ -62,14 +62,11 @@ #include <qgeoserviceprovider.h> #include <qgeomappingmanager.h> -#include <QGraphicsSceneMouseEvent> #include <QDeclarativeContext> #include <QtDeclarative/qdeclarativeinfo.h> #include <QModelIndex> -#include <QApplication> #include <QSGCanvas> #include <QSGEngine> -#include <QDesktopWidget> #include <QtGui/QGuiApplication> #include <QDebug> diff --git a/src/imports/location/qdeclarativegeomapflickable.cpp b/src/imports/location/qdeclarativegeomapflickable.cpp index 23441302..41eb2ea8 100644 --- a/src/imports/location/qdeclarativegeomapflickable.cpp +++ b/src/imports/location/qdeclarativegeomapflickable.cpp @@ -41,7 +41,6 @@ #include <QtGui/QGuiApplication> #include <QtGui/QStyleHints> -#include <QGraphicsSceneMouseEvent> #include <QPropertyAnimation> #include <QEasingCurve> #include "qdeclarativegeomapflickable_p.h" diff --git a/src/imports/location/qdeclarativeposition.cpp b/src/imports/location/qdeclarativeposition.cpp index 7bed1f59..dd828481 100644 --- a/src/imports/location/qdeclarativeposition.cpp +++ b/src/imports/location/qdeclarativeposition.cpp @@ -43,7 +43,6 @@ #include "qdeclarative.h" #include <qnmeapositioninfosource.h> #include <QFile> -#include <QApplication> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativepositionsource.cpp b/src/imports/location/qdeclarativepositionsource.cpp index e3cb3834..e47b4e7e 100644 --- a/src/imports/location/qdeclarativepositionsource.cpp +++ b/src/imports/location/qdeclarativepositionsource.cpp @@ -46,7 +46,6 @@ #include <qnmeapositioninfosource.h> #include <QFile> #include <QTimer> -#include <QApplication> #if defined(Q_OS_SYMBIAN) #include <e32std.h> #endif |