diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-06-04 14:46:29 +0200 |
|---|---|---|
| committer | Alex <alexander.blasche@digia.com> | 2013-06-10 08:25:04 +0200 |
| commit | 7f914e394cf7505a6fee342ca8f838a74ba9e363 (patch) | |
| tree | 8b01134ad0445bbad759d018a2008f2f73e6334f | |
| parent | 9590ffd0ec7f3e45af52fe12e911bca762637f9b (diff) | |
| download | qtlocation-7f914e394cf7505a6fee342ca8f838a74ba9e363.tar.gz | |
Set proper QtLocation version and don't build tests depending on Qt3d
QtLocation version is anticipated to be Qt 5.2 (time will really tell)
Change-Id: I16fa0501489c10515286bb17e19336ac4141ff8d
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Reviewed-by: Alex <alexander.blasche@digia.com>
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 45 |
2 files changed, 27 insertions, 20 deletions
diff --git a/.qmake.conf b/.qmake.conf index 8840bd92..2f09a2ba 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 0.0.0 +MODULE_VERSION = 5.2.0 diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 88adb7d4..9ac74891 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -8,9 +8,6 @@ SUBDIRS += qplace \ qplacecontentrequest \ qplacedetailsreply \ qplaceeditorial \ - qplacemanager \ - qplacemanager_unsupported \ - qplacemanager_nokia \ qplacematchreply \ qplacematchrequest \ qplaceimage \ @@ -27,44 +24,54 @@ SUBDIRS += qplace \ qmlinterface \ cmake -SUBDIRS += geotestplugin \ - placesplugin_unsupported \ +qtHaveModule(3d) { + SUBDIRS += qplacemanager \ + qplacemanager_nokia \ + qplacemanager_unsupported +} + +SUBDIRS += \ positionplugin \ positionplugintest \ - qgeocodingmanagerplugins \ qgeoaddress \ qgeoareamonitor \ qgeoshape \ qgeorectangle \ qgeocircle \ + qgeocoordinate \ + qgeolocation \ + qgeopositioninfo \ + qgeopositioninfosource \ + qgeosatelliteinfo \ + qgeosatelliteinfosource \ + qnmeapositioninfosource \ + declarative_core \ + doublevectors + +!mac: SUBDIRS += declarative_ui + +qtHaveModule(3d) { + SUBDIRS += geotestplugin \ + placesplugin_unsupported \ + qgeocodingmanagerplugins \ + qgeocameracapabilities\ qgeocameradata \ - qgeocameracapabilities \ - qgeocameratiles \ qgeocodereply \ qgeocodingmanager \ - qgeocoordinate \ - qgeolocation \ qgeomaneuver \ qgeomapscene \ - qgeopositioninfo \ - qgeopositioninfosource \ qgeoroute \ qgeoroutereply \ qgeorouterequest \ qgeoroutesegment \ qgeoroutingmanager \ qgeoroutingmanagerplugins \ - qgeosatelliteinfo \ - qgeosatelliteinfosource \ qgeotilespec \ - qnmeapositioninfosource \ - declarative_core \ qgeoroutexmlparser \ qgeomapcontroller \ maptype \ nokia_services \ - doublevectors - -!mac: SUBDIRS += declarative_ui + qgeocameratiles +} qtHaveModule(jsondb): SUBDIRS += qplacemanager_jsondb |