Improve definition of projects belonging to QtPositioning & QtLocation

This enables clean builds of qtlocation repo even if Qt3D is not available.
In such cases only QtPositioning related projects should be build.

There is a small build fix as well as some quick related includes
changed from proper includes to forward declarations.

Change-Id: Ifa8a9315beabcc1f64be219f8fa55236bf4ce42f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

12 files changed, 54 insertions, 40 deletions

diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index ac340141..460fe156 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
 qtHaveModule(positioning): SUBDIRS += positioning
-qtHaveModule(3d):qtHaveModule(location): SUBDIRS += location
+qtHaveModule(location): SUBDIRS += location
 
diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp
index 51ccaf4d..a9f6fffa 100644
--- a/src/imports/location/qdeclarativegeomapmousearea.cpp
+++ b/src/imports/location/qdeclarativegeomapmousearea.cpp
@@ -45,6 +45,7 @@
 #include <QtQuick/QQuickWindow>
 
 #include <QtQuick/private/qquickevents_p_p.h>
+#include <QtQuick/private/qquickdrag_p.h>
 
 #include <QDebug>
 
diff --git a/src/location/location.pro b/src/location/location.pro
index 2ba446b6..c09ea06f 100644
--- a/src/location/location.pro
+++ b/src/location/location.pro
@@ -12,7 +12,7 @@ PUBLIC_HEADERS += \
 SOURCES += \
            qlocation.cpp
 
-qtHaveModule(3d): include(maps/maps.pri)
+include(maps/maps.pri)
 include(places/places.pri)
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 457e8051..099f7995 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 qtHaveModule(positioning): SUBDIRS +=  position
-qtHaveModule(3d):qtHaveModule(location) SUBDIRS += geoservices
+qtHaveModule(location) SUBDIRS += geoservices
diff --git a/src/src.pro b/src/src.pro
index bb05e39f..f6e41510 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,6 +1,13 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS += 3rdparty positioning location plugins
 
+SUBDIRS += positioning
+
+#no point in building QtLocation without Qt3D
+qtHaveModule(3d) {
+    SUBDIRS += location 3rdparty
+}
+
+SUBDIRS += plugins
 qtHaveModule(quick): SUBDIRS += imports
 
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 7cb6d27e..d9517add 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,7 +1,9 @@
 TEMPLATE = subdirs
 
-#Place unit tests
-SUBDIRS += qplace \
+qtHaveModule(location) {
+
+    #Place unit tests
+    SUBDIRS += qplace \
            qplaceattribute \
            qplacecategory \
            qplacecontactdetail \
@@ -22,38 +24,18 @@ SUBDIRS += qplace \
            qplacesearchreply \
            qplacesearchsuggestionreply \
            qplaceuser \
-           qmlinterface \
-           cmake
-
-qtHaveModule(3d) {
-    SUBDIRS += qplacemanager \
-            qplacemanager_nokia \
-            qplacemanager_unsupported
-}
+           qplacemanager \
+           qplacemanager_nokia \
+           qplacemanager_unsupported \
+           placesplugin_unsupported
 
-SUBDIRS += \
-           positionplugin \
-           positionplugintest \
-           qgeoaddress \
-           qgeoareamonitor \
-           qgeoshape \
-           qgeorectangle \
-           qgeocircle \
-           qgeocoordinate \
-           qgeolocation \
-           qgeopositioninfo \
-           qgeopositioninfosource \
-           qgeosatelliteinfo \
-           qgeosatelliteinfosource \
-           qnmeapositioninfosource \
-           declarative_core \
+    #misc tests
+    SUBDIRS +=  qmlinterface \
+           cmake \
            doublevectors
 
-!mac: SUBDIRS += declarative_ui
-
-qtHaveModule(3d) {
+    #Map and Navigation tests
     SUBDIRS += geotestplugin \
-           placesplugin_unsupported \
            qgeocodingmanagerplugins \
            qgeocameracapabilities\
            qgeocameradata \
@@ -73,4 +55,27 @@ qtHaveModule(3d) {
            maptype \
            nokia_services \
            qgeocameratiles
+
+    qtHaveModule(quick) {
+        SUBDIRS += declarative_core
+
+        !mac: SUBDIRS += declarative_ui
+    }
 }
+
+
+SUBDIRS += \
+           positionplugin \
+           positionplugintest \
+           qgeoaddress \
+           qgeoareamonitor \
+           qgeoshape \
+           qgeorectangle \
+           qgeocircle \
+           qgeocoordinate \
+           qgeolocation \
+           qgeopositioninfo \
+           qgeopositioninfosource \
+           qgeosatelliteinfo \
+           qgeosatelliteinfosource \
+           qnmeapositioninfosource
diff --git a/tests/auto/qgeoareamonitor/qgeoareamonitor.pro b/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
index 6eae9da3..05cc5ef5 100644
--- a/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
+++ b/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
@@ -4,5 +4,5 @@ TARGET=tst_qgeoareamonitor
 
 SOURCES += tst_qgeoareamonitor.cpp
 
-QT += location testlib
+QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeopositioninfo/qgeopositioninfo.pro b/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
index 1817c522..d5a740c0 100644
--- a/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
+++ b/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
@@ -4,5 +4,5 @@ TARGET=tst_qgeopositioninfo
 
 SOURCES += tst_qgeopositioninfo.cpp
 
-QT += location testlib
+QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
index 5a0baf62..0a49168f 100644
--- a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
+++ b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
@@ -10,5 +10,5 @@ SOURCES += ../utils/qlocationtestutils.cpp \
            testqgeopositioninfosource.cpp \
            tst_qgeopositioninfosource.cpp
 
-QT += location testlib
+QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro b/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro
index 63900936..05ca4c03 100644
--- a/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro
+++ b/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro
@@ -4,5 +4,5 @@ TARGET=tst_qgeosatelliteinfo
 
 SOURCES += tst_qgeosatelliteinfo.cpp
 
-QT += testlib location
+QT += testlib positioning
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro
index fe5291b9..ea6c929f 100644
--- a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro
+++ b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro
@@ -9,7 +9,7 @@ SOURCES += tst_qgeosatelliteinfosource.cpp \
 HEADERS += testqgeosatelliteinfosource_p.h \
             ../utils/qlocationtestutils_p.h
 
-QT += location testlib
+QT += positioning testlib
 
 # Define whether a satellite source is available.  This must match the logic in
 # src/location/location.pro or the test will fail on some platforms.
diff --git a/tests/tests.pro b/tests/tests.pro
index 85ea52e5..4fa2b336 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS = auto plugins/declarativetestplugin
+SUBDIRS = auto
+qtHaveModule(location):qtHaveModule(quick): SUBDIRS += plugins/declarativetestplugin