summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/location/location.pro3
-rw-r--r--src/imports/location/qdeclarative3dgraphicsgeomap.cpp3
-rw-r--r--src/imports/location/qdeclarativegeomapflickable.cpp1
-rw-r--r--src/imports/location/qdeclarativeposition.cpp1
-rw-r--r--src/imports/location/qdeclarativepositionsource.cpp1
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