diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-05-25 15:12:04 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-29 01:01:34 +0200 |
| commit | e2fda7e34f1c8ff39a86800c14ec7cecb085c2af (patch) | |
| tree | 6780d22e9d9bbeba15fa291faadce6f7abec775e /config.tests | |
| parent | 5effd1712aa6f1ae2359762cdadeb70198121f77 (diff) | |
| download | qtsensors-e2fda7e34f1c8ff39a86800c14ec7cecb085c2af.tar.gz | |
Do not run the bbsensor_header test on other platforms.
Make the Q_OS_BLACKBERRY define check explicit.
Don't run the test unless CONFIG += blackberry has been used.
This makes for a quicker "fail" path on other platforms and
a slightly stricter "success" path.
Change-Id: I00d8e66eb0abe765a2eeb70698bebfb38783ec9b
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/bbsensor_header/bbsensor_header.pro | 4 | ||||
| -rw-r--r-- | config.tests/bbsensor_header/main.cpp | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/config.tests/bbsensor_header/bbsensor_header.pro b/config.tests/bbsensor_header/bbsensor_header.pro index 362ae67..f5ebc9b 100644 --- a/config.tests/bbsensor_header/bbsensor_header.pro +++ b/config.tests/bbsensor_header/bbsensor_header.pro @@ -1,5 +1,3 @@ TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - SOURCES += main.cpp +requires(blackberry) diff --git a/config.tests/bbsensor_header/main.cpp b/config.tests/bbsensor_header/main.cpp index 6ebc6f3..85b0ec3 100644 --- a/config.tests/bbsensor_header/main.cpp +++ b/config.tests/bbsensor_header/main.cpp @@ -39,18 +39,16 @@ ** ****************************************************************************/ #include <QtCore/qglobal.h> - -#ifdef Q_OS_BLACKBERRY -#include <sensor/sensor.h> +#ifndef Q_OS_BLACKBERRY +#error "Missing Q_OS_BLACKBERRY" #endif +#include <sensor/sensor.h> int main(int argc, char** argv) { Q_UNUSED(argc); Q_UNUSED(argv); -#ifdef Q_OS_BLACKBERRY sensor_event_t event; Q_UNUSED(event); -#endif return 0; } |