Fix build system

With the previous setup the location module wasn't properly set up
when qmake was run for the first time with '-r' and no previous
version of QtLocation installed. This caused the building of some
plugins to be skipped later.

It also just looks so much better with the dependencies and subdirs
properly grouped and without the ugly $$QT.location.include things.

Task-number: QTBUG-44983
Change-Id: I0396df078b755a1316ba896ece77620184286a86
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 17 insertions, 19 deletions

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
 }