summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-11 03:01:59 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-11 03:01:59 +0200
commit8924486751f0b0038f75516656fd9b9560d8489c (patch)
tree05e24e955efbf46697e97f379a0e9a0b005084ab
parenta2f4e0f2cb76bbd318d78a99acfe266380c721be (diff)
parentd94ce8943724779d465e403663a076941c561c68 (diff)
downloadqtlocation-8924486751f0b0038f75516656fd9b9560d8489c.tar.gz
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I657e61aba9a65be05876c5b1822a3bf7c88857d5
-rw-r--r--tests/auto/auto.pro39
1 files changed, 23 insertions, 16 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 51a45887..745e264b 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -23,16 +23,17 @@ qtHaveModule(location) {
qplacesearchresult \
qplacesearchreply \
qplacesearchsuggestionreply \
- qplaceuser \
+ qplaceuser
+
+ !android: SUBDIRS += \
qplacemanager \
qplacemanager_nokia \
qplacemanager_unsupported \
placesplugin_unsupported
#misc tests
- SUBDIRS += qmlinterface \
- cmake \
- doublevectors
+ SUBDIRS += doublevectors
+ !android: SUBDIRS += cmake qmlinterface # looks for .qmls locally
#Map and Navigation tests
SUBDIRS += geotestplugin \
@@ -40,26 +41,28 @@ qtHaveModule(location) {
qgeocameracapabilities\
qgeocameradata \
qgeocodereply \
- qgeocodingmanager \
qgeomaneuver \
qgeotiledmapscene \
qgeoroute \
qgeoroutereply \
qgeorouterequest \
qgeoroutesegment \
- qgeoroutingmanager \
qgeoroutingmanagerplugins \
- qgeoserviceprovider \
- qgeotiledmap \
qgeotilespec \
qgeoroutexmlparser \
maptype \
- nokia_services \
qgeocameratiles
- qtHaveModule(quick) {
- SUBDIRS += declarative_core \
- declarative_geoshape
+ # These use plugins
+ !android: SUBDIRS += qgeoserviceprovider \
+ qgeoroutingmanager \
+ nokia_services \
+ qgeocodingmanager \
+ qgeotiledmap
+
+ qtHaveModule(quick):!android {
+ SUBDIRS += declarative_geoshape \
+ declarative_core
!mac: SUBDIRS += declarative_ui
}
@@ -67,10 +70,7 @@ qtHaveModule(location) {
SUBDIRS += \
- positionplugin \
- positionplugintest \
qgeoaddress \
- qgeoareamonitor \
qgeoshape \
qgeorectangle \
qgeocircle \
@@ -79,8 +79,15 @@ SUBDIRS += \
qgeocoordinate \
qgeolocation \
qgeopositioninfo \
- qgeopositioninfosource \
qgeosatelliteinfo \
qgeosatelliteinfosource \
qgeojson \
qnmeapositioninfosource
+
+!android: SUBDIRS += \
+ positionplugin \
+ positionplugintest \
+ qgeoareamonitor \
+ qgeopositioninfosource \
+ qgeosatelliteinfosource \
+ qnmeapositioninfosource