diff options
| -rw-r--r-- | modules/qt_location.pri | 2 | ||||
| -rw-r--r-- | src/location/location.pro | 2 | ||||
| -rw-r--r-- | src/location/maps/maps.pri | 2 | ||||
| -rw-r--r-- | src/location/maps/qgeomappingmanager.cpp | 1 | ||||
| -rw-r--r-- | src/location/maps/qgeomappingmanagerengine.cpp | 1 | ||||
| -rw-r--r-- | src/location/maps/qgeotiledmappingmanagerengine.cpp | 1 | ||||
| -rw-r--r-- | src/location/maps/qgeotilefetcher.cpp | 3 | ||||
| -rw-r--r-- | tests/applications/declarative_map/map3d.pro | 2 | ||||
| -rw-r--r-- | tests/auto/nokia_services/routing/routing.pro | 2 | ||||
| -rw-r--r-- | tests/plugins/declarativetestplugin/declarativetestplugin.pro | 2 | ||||
| -rw-r--r-- | tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp | 1 |
11 files changed, 6 insertions, 13 deletions
diff --git a/modules/qt_location.pri b/modules/qt_location.pri index 8fa187e1..f0cbb95a 100644 --- a/modules/qt_location.pri +++ b/modules/qt_location.pri @@ -11,7 +11,7 @@ QT.location.sources = $$QT_MODULE_BASE/src/location QT.location.libs = $$QT_MODULE_LIB_BASE QT.location.plugins = $$QT_MODULE_PLUGIN_BASE QT.location.imports = $$QT_MODULE_IMPORT_BASE -QT.location.depends = gui 3d sql network +QT.location.depends = gui 3d QT.location.DEFINES = QT_LOCATION_LIB QT_CONFIG += location diff --git a/src/location/location.pro b/src/location/location.pro index 86e63229..45fe54d7 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -6,7 +6,7 @@ QPRO_PWD = $$PWD CONFIG += module MODULE_PRI = ../../modules/qt_location.pri -QT = core core-private gui network +QT = core core-private gui DEFINES += QT_BUILD_LOCATION_LIB QT_MAKEDLL diff --git a/src/location/maps/maps.pri b/src/location/maps/maps.pri index fa427f2f..a44e129d 100644 --- a/src/location/maps/maps.pri +++ b/src/location/maps/maps.pri @@ -1,7 +1,7 @@ INCLUDEPATH += maps -QT += network 3d +QT += 3d PUBLIC_HEADERS += \ maps/qgeocameracapabilities_p.h \ diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp index 2856344e..5d2f77dd 100644 --- a/src/location/maps/qgeomappingmanager.cpp +++ b/src/location/maps/qgeomappingmanager.cpp @@ -49,7 +49,6 @@ #include "qgeomap_p.h" #include <QTimer> -#include <QNetworkProxy> #include <QLocale> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp index 52a0329f..895ce2f4 100644 --- a/src/location/maps/qgeomappingmanagerengine.cpp +++ b/src/location/maps/qgeomappingmanagerengine.cpp @@ -45,7 +45,6 @@ #include "qgeotilespec.h" #include <QThread> -#include <QNetworkProxy> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeotiledmappingmanagerengine.cpp b/src/location/maps/qgeotiledmappingmanagerengine.cpp index b8c12e1b..5133a77c 100644 --- a/src/location/maps/qgeotiledmappingmanagerengine.cpp +++ b/src/location/maps/qgeotiledmappingmanagerengine.cpp @@ -50,7 +50,6 @@ #include "qgeotilespec.h" #include <QTimer> -#include <QNetworkProxy> #include <QLocale> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeotilefetcher.cpp b/src/location/maps/qgeotilefetcher.cpp index 65853a65..d27964ee 100644 --- a/src/location/maps/qgeotilefetcher.cpp +++ b/src/location/maps/qgeotilefetcher.cpp @@ -46,9 +46,6 @@ #include "qgeotilespec.h" #include "qgeotiledmapdata_p.h" -#include <QThread> -#include <QNetworkProxy> - QT_BEGIN_NAMESPACE QGeoTileFetcher::QGeoTileFetcher(QGeoTiledMappingManagerEngine *engine, QObject *parent) diff --git a/tests/applications/declarative_map/map3d.pro b/tests/applications/declarative_map/map3d.pro index b1da90cf..64978b31 100644 --- a/tests/applications/declarative_map/map3d.pro +++ b/tests/applications/declarative_map/map3d.pro @@ -1,7 +1,7 @@ TARGET = qml_location_map3d TEMPLATE=app -QT += network widgets quick +QT += network quick SOURCES += qmlmap3d.cpp diff --git a/tests/auto/nokia_services/routing/routing.pro b/tests/auto/nokia_services/routing/routing.pro index 7c3524c1..f0ec3d6e 100644 --- a/tests/auto/nokia_services/routing/routing.pro +++ b/tests/auto/nokia_services/routing/routing.pro @@ -2,7 +2,7 @@ TEMPLATE = app CONFIG += testcase TARGET = tst_nokia_routing -QT += location testlib +QT += network location testlib INCLUDEPATH += $$PWD/../../../../src/plugins/geoservices/nokia HEADERS += $$PWD/../../../../src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h diff --git a/tests/plugins/declarativetestplugin/declarativetestplugin.pro b/tests/plugins/declarativetestplugin/declarativetestplugin.pro index 40bedfb7..9b244877 100644 --- a/tests/plugins/declarativetestplugin/declarativetestplugin.pro +++ b/tests/plugins/declarativetestplugin/declarativetestplugin.pro @@ -3,7 +3,7 @@ TARGETPATH = QtLocation/test include(../../../src/imports/location/qlocationimport.pri) -QT += qml quick location widgets +QT += qml quick location DESTDIR = $$QT.location.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH diff --git a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp index 1323f4f7..b88f4923 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp +++ b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel.cpp @@ -41,7 +41,6 @@ #include "qdeclarativelocationtestmodel_p.h" #include <qgeocoordinate.h> -#include <QtWidgets/QApplication> #include <QtCore/QTime> #include <QtCore> |