From 0cb5a2f498b38331c6c3bdd5d53777acadd5feea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= <jan-arve.saether@qt.io>
Date: Fri, 20 Sep 2019 16:04:32 +0200
Subject: Ensure that geotestplugin is built before the targets that depends on
 it

Change-Id: Ib3a9ea37506e29eafcfb45e0c1d73a4c65d8e70b
Fixes: QTBUG-78562
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
---
 tests/auto/auto.pro | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 05559d12..2b04d110 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -2,6 +2,8 @@ TEMPLATE = subdirs
 
 qtHaveModule(location) {
 
+    SUBDIRS += geotestplugin    # several subtargets depend on this
+
     #Place unit tests
     SUBDIRS += qplace \
            qplaceattribute \
@@ -25,19 +27,22 @@ qtHaveModule(location) {
            qplacesearchsuggestionreply \
            qplaceuser
 
-    !android: SUBDIRS += \
+    !android: {
+        SUBDIRS += \
            qplacemanager \
            qplacemanager_nokia \
            qplacemanager_unsupported \
            placesplugin_unsupported
 
+        qplacemanager.depends = geotestplugin
+    }
+
     #misc tests
     SUBDIRS +=   doublevectors
     !android: SUBDIRS += cmake qmlinterface # looks for .qmls locally
 
     #Map and Navigation tests
-    SUBDIRS += geotestplugin \
-           qgeocodingmanagerplugins \
+    SUBDIRS += qgeocodingmanagerplugins \
            qgeocameracapabilities\
            qgeocameradata \
            qgeocodereply \
@@ -54,17 +59,25 @@ qtHaveModule(location) {
            qgeocameratiles
 
     # These use plugins
-    !android: SUBDIRS += qgeoserviceprovider \
+    !android: {
+        SUBDIRS += qgeoserviceprovider \
                          qgeoroutingmanager \
                          nokia_services \
                          qgeocodingmanager \
                          qgeotiledmap
 
+        qgeoserviceprovider.depends = geotestplugin
+        qgeotiledmap.depends = geotestplugin
+    }
     qtHaveModule(quick):!android {
         SUBDIRS += declarative_geoshape \
                    declarative_core
+        declarative_core.depends = geotestplugin
 
-        !mac: SUBDIRS += declarative_ui
+        !mac: {
+            SUBDIRS += declarative_ui
+            declarative_ui.depends = geotestplugin
+        }
     }
 }
 
-- 
cgit v1.2.1