diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-09-11 16:50:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-16 09:33:30 +0200 |
| commit | db8c9f18d087412849b91d26bc1b496237fb9c10 (patch) | |
| tree | 0eeedd9569b8106d6f23acf7e954a60b0721c0ac /tests/auto/auto.pro | |
| parent | e31739e1b6d24616654b03d30bcdf6aeba037117 (diff) | |
| download | qtlocation-db8c9f18d087412849b91d26bc1b496237fb9c10.tar.gz | |
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>
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 65 |
1 files changed, 35 insertions, 30 deletions
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 |