diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-08 03:00:30 +0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2019-06-08 08:34:52 +0000 |
| commit | eed16a8d66a4dafaf7f1c4aae0308fae8c2018e1 (patch) | |
| tree | b4aea6b44547c8f58c08c51b50b81e7ca664c777 /tests | |
| parent | 90defc33dceb341aa8dac03c0511b1ef2a20c6c2 (diff) | |
| parent | 0e64148b39ab7e7417d9d115ddc53631167989b1 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
tests/auto/auto.pro
Change-Id: Ibb9c7c93a30d981f7e519eda495436c1c4873aa0
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 39 |
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 |