diff options
-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 |