9 files changed, 17 insertions, 34 deletions
diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro
index a0f8d1b6..1e69d4d6 100644
--- a/src/plugins/geoservices/nokia/nokia.pro
+++ b/src/plugins/geoservices/nokia/nokia.pro
@@ -54,7 +54,6 @@ include(placesv2/placesv2.pri)
 
 RESOURCES += resource.qrc
 
-INCLUDEPATH += $$QT.location.includes
 INCLUDEPATH += ../../../location/maps
 
 OTHER_FILES += \
diff --git a/src/plugins/position/blackberry/blackberry.pro b/src/plugins/position/blackberry/blackberry.pro
index f64c8026..7e140391 100644
--- a/src/plugins/position/blackberry/blackberry.pro
+++ b/src/plugins/position/blackberry/blackberry.pro
@@ -5,8 +5,6 @@ PLUGIN_TYPE = position
 PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryBb
 load(qt_plugin)
 
-INCLUDEPATH += $$QT.location.includes
-
 LIBS = -lwmm -llocation_manager -lpps
 
 SOURCES += qgeopositioninfosource_bb.cpp \
diff --git a/src/plugins/position/corelocation/corelocation.pro b/src/plugins/position/corelocation/corelocation.pro
index 1a1a2a39..25748008 100644
--- a/src/plugins/position/corelocation/corelocation.pro
+++ b/src/plugins/position/corelocation/corelocation.pro
@@ -5,8 +5,6 @@ PLUGIN_TYPE = position
 PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryCL
 load(qt_plugin)
 
-INCLUDEPATH += $$QT.location.includes
-
 OBJECTIVE_SOURCES += \
     qgeopositioninfosource_cl.mm \
     qgeopositioninfosourcefactory_cl.mm
diff --git a/src/plugins/position/geoclue/geoclue.pro b/src/plugins/position/geoclue/geoclue.pro
index 0aba06e3..a3c34ece 100644
--- a/src/plugins/position/geoclue/geoclue.pro
+++ b/src/plugins/position/geoclue/geoclue.pro
@@ -24,8 +24,6 @@ qtHaveModule(dbus):config_geoclue-satellite {
     SOURCES += qgeosatelliteinfosource_geocluemaster.cpp
 }
 
-INCLUDEPATH += $$QT.location.includes
-
 CONFIG += link_pkgconfig
 PKGCONFIG += geoclue
 
diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro
index 8e9f7dfa..f5c5a087 100644
--- a/src/plugins/position/gypsy/gypsy.pro
+++ b/src/plugins/position/gypsy/gypsy.pro
@@ -13,8 +13,6 @@ SOURCES += \
     qgeosatelliteinfosource_gypsy.cpp \
     qgeopositioninfosourcefactory_gypsy.cpp
 
-INCLUDEPATH += $$QT.location.includes
-
 CONFIG += link_pkgconfig
 PKGCONFIG += gypsy gconf-2.0
 
diff --git a/src/plugins/position/positionpoll/positionpoll.pro b/src/plugins/position/positionpoll/positionpoll.pro
index dc7ebed1..cb84e79a 100644
--- a/src/plugins/position/positionpoll/positionpoll.pro
+++ b/src/plugins/position/positionpoll/positionpoll.pro
@@ -13,7 +13,5 @@ HEADERS += \
     qgeoareamonitor_polling.h \
     positionpollfactory.h
 
-INCLUDEPATH += $$QT.location.includes
-
 OTHER_FILES += \
     plugin.json
diff --git a/src/plugins/position/simulator/simulator.pro b/src/plugins/position/simulator/simulator.pro
index 23953782..f9e2bdb5 100644
--- a/src/plugins/position/simulator/simulator.pro
+++ b/src/plugins/position/simulator/simulator.pro
@@ -5,8 +5,6 @@ PLUGIN_TYPE = position
 PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySimulator
 load(qt_plugin)
 
-INCLUDEPATH += $$QT.location.includes
-
 QT += simulator
 DEFINES += QT_SIMULATOR
 SOURCES += qgeopositioninfosource_simulator.cpp \
diff --git a/src/plugins/position/winrt/winrt.pro b/src/plugins/position/winrt/winrt.pro
index eb4f4b74..228a9e78 100644
--- a/src/plugins/position/winrt/winrt.pro
+++ b/src/plugins/position/winrt/winrt.pro
@@ -5,8 +5,6 @@ PLUGIN_TYPE = position
 PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactoryWinrt
 load(qt_plugin)
 
-INCLUDEPATH += $$QT.location.includes
-
 SOURCES += qgeopositioninfosource_winrt.cpp \
     qgeopositioninfosourcefactory_winrt.cpp
 HEADERS += qgeopositioninfosource_winrt_p.h \
diff --git a/src/src.pro b/src/src.pro
index dc0dcad1..232737c4 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,35 +1,33 @@
 TEMPLATE = subdirs
 
 SUBDIRS += positioning
+plugins.depends += positioning
 
-plugins.depends = positioning
-SUBDIRS += plugins
+qtHaveModule(quick) {
+    SUBDIRS += 3rdparty
 
-contains(QT_CONFIG, private_tests) {
-    positioning_doc_snippets.subdir = positioning/doc/snippets
-    #plugin dependency required during static builds
-    positioning_doc_snippets.depends = positioning plugins
+    SUBDIRS += location
+    location.depends += positioning 3rdparty
+    plugins.depends += location
 
-    SUBDIRS += positioning_doc_snippets
+    SUBDIRS += imports
+    imports.depends += positioning location
 }
 
-qtHaveModule(quick) {
-    SUBDIRS += 3rdparty
+SUBDIRS += plugins
 
-    location.depends = positioning 3rdparty
-    SUBDIRS += location
+contains(QT_CONFIG, private_tests) {
+    SUBDIRS += positioning_doc_snippets
+    positioning_doc_snippets.subdir = positioning/doc/snippets
 
-    plugins.depends += location
-    imports.depends += location
+    #plugin dependency required during static builds
+    positioning_doc_snippets.depends = positioning plugins
 
-    contains(QT_CONFIG, private_tests) {
+    qtHaveModule(quick) {
+        SUBDIRS += location_doc_snippets
         location_doc_snippets.subdir = location/doc/snippets
+
         #plugin dependency required during static builds
         location_doc_snippets.depends = location plugins
-
-        SUBDIRS += location_doc_snippets
     }
-
-    imports.depends += positioning
-    SUBDIRS += imports
 }