diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-05 14:47:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 05:38:52 +0200 |
| commit | 252a1332355a1d25c2e9d05295c3f22e9351c575 (patch) | |
| tree | b6bd88bd09c521e2fa01a27f22a26caa9ec26ac4 | |
| parent | 44c47a3b659f1103c45a3e9b8a0a2ff1f1887cdd (diff) | |
| download | qtlocation-252a1332355a1d25c2e9d05295c3f22e9351c575.tar.gz | |
switch to new-style configure tests
Change-Id: I15247291dc56c4fd7ae2415a3de1541c9f8b295b
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
| -rw-r--r-- | qtlocation.pro | 3 | ||||
| -rw-r--r-- | src/plugins/position/position.pro | 2 | ||||
| -rw-r--r-- | sync.profile | 5 | ||||
| -rw-r--r-- | tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/qtlocation.pro b/qtlocation.pro index b797d965..7ee5fca5 100644 --- a/qtlocation.pro +++ b/qtlocation.pro @@ -1,3 +1,6 @@ +load(configure) +qtCompileTest(locationd) + TEMPLATE = subdirs module_qtlocation_src.subdir = src diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro index cdfc5379..0b80ef24 100644 --- a/src/plugins/position/position.pro +++ b/src/plugins/position/position.pro @@ -5,5 +5,5 @@ meego { contains (geoclue-master_enabled, yes):SUBDIRS += geoclue contains (gypsy_enabled, yes):SUBDIRS += gypsy } -contains(config_test_locationd, yes):!simulator:SUBDIRS += npe_backend +config_locationd:!simulator:SUBDIRS += npe_backend simulator:SUBDIRS += simulator diff --git a/sync.profile b/sync.profile index c4dd1a1d..2094cb24 100644 --- a/sync.profile +++ b/sync.profile @@ -25,8 +25,3 @@ "qtjsbackend" => "refs/heads/master", "qt3d" => "refs/heads/master" ); - -# compile tests -%configtests = ( - "locationd" => {}, -); diff --git a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro index 4c943367..86d0f7db 100644 --- a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro +++ b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro @@ -14,5 +14,5 @@ QT += location testlib # Define whether a satellite source is available. This must match the logic in # src/location/location.pro or the test will fail on some platforms. maemo6|meego:DEFINES += SATELLITE_SOURCE_AVAILABLE -contains(config_test_locationd, yes):!simulator:DEFINES += SATELLITE_SOURCE_AVAILABLE +config_locationd:!simulator:DEFINES += SATELLITE_SOURCE_AVAILABLE simulator:DEFINES += SATELLITE_SOURCE_AVAILABLE |