diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2012-08-08 15:39:21 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-08 16:32:16 +0200 |
| commit | 448f4131f40ed15cbdfff221247d0986ffa3204e (patch) | |
| tree | 87bff848f351c2a995e02adc2f5bbb2965ad1bcb | |
| parent | de70333227709d289a96718009aa7851db5f5df5 (diff) | |
Port configure tests to the new style to make them work again
Change-Id: Ia7a284fc407a28a3cfae14358a8286864ad0c25a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | config.tests/bbsensor_header/bbsensor_header.pro | 1 | ||||
| -rw-r--r-- | qtsensors.pro | 5 | ||||
| -rw-r--r-- | src/plugins/sensors/blackberry/blackberry.pro | 4 | ||||
| -rw-r--r-- | sync.profile | 7 |
4 files changed, 9 insertions, 8 deletions
diff --git a/config.tests/bbsensor_header/bbsensor_header.pro b/config.tests/bbsensor_header/bbsensor_header.pro index f5ebc9b7..349130a3 100644 --- a/config.tests/bbsensor_header/bbsensor_header.pro +++ b/config.tests/bbsensor_header/bbsensor_header.pro @@ -1,3 +1,4 @@ TEMPLATE = app SOURCES += main.cpp +CONFIG += qt requires(blackberry) diff --git a/qtsensors.pro b/qtsensors.pro index daeb9760..9a71034b 100644 --- a/qtsensors.pro +++ b/qtsensors.pro @@ -1,3 +1,8 @@ +load(configure) +blackberry { + qtCompileTest(bbsensor_header) +} + load(qt_parts) SUBDIRS += module_qtsensors_snippets diff --git a/src/plugins/sensors/blackberry/blackberry.pro b/src/plugins/sensors/blackberry/blackberry.pro index 8a05ec0f..ef6dda60 100644 --- a/src/plugins/sensors/blackberry/blackberry.pro +++ b/src/plugins/sensors/blackberry/blackberry.pro @@ -6,7 +6,9 @@ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII load(qt_plugin) -contains(config_test_bbsensor_header, yes):DEFINES += HAVE_NDK_SENSOR_H +config_bbsensor_header { + DEFINES += HAVE_NDK_SENSOR_H +} DESTDIR = $$QT.sensors.plugins/sensors diff --git a/sync.profile b/sync.profile index e1451a65..36e545af 100644 --- a/sync.profile +++ b/sync.profile @@ -8,10 +8,3 @@ "qtdeclarative" => "refs/heads/master", "qtjsbackend" => "refs/heads/master", ); - -# Compile tests -%configtests = ( - # Blackberry tests - "bbsensor_header" => {}, -); - |