From e2fda7e34f1c8ff39a86800c14ec7cecb085c2af Mon Sep 17 00:00:00 2001
From: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Date: Fri, 25 May 2012 15:12:04 +1000
Subject: 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>
---
 config.tests/bbsensor_header/bbsensor_header.pro | 4 +---
 config.tests/bbsensor_header/main.cpp            | 8 +++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'config.tests')

diff --git a/config.tests/bbsensor_header/bbsensor_header.pro b/config.tests/bbsensor_header/bbsensor_header.pro
index 362ae67b..f5ebc9b7 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 6ebc6f3d..85b0ec30 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;
 }
-- 
cgit v1.2.3