Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: Idce0f9b94f9e585abfb6903f554500a06f4f8aaa

1 files changed, 21 insertions, 9 deletions

diff --git a/src/plugins/sensors/generic/generic.pro b/src/plugins/sensors/generic/generic.pro
index 2d4f9f9..fcc1bfc 100644
--- a/src/plugins/sensors/generic/generic.pro
+++ b/src/plugins/sensors/generic/generic.pro
@@ -4,15 +4,27 @@ QT = core sensors
 PLUGIN_TYPE = sensors
 load(qt_plugin)
 
-HEADERS += genericorientationsensor.h\
-           genericrotationsensor.h\
-           genericalssensor.h\
-           generictiltsensor.h
-
-SOURCES += genericorientationsensor.cpp\
-           main.cpp\
-           genericrotationsensor.cpp\
-           genericalssensor.cpp\
+HEADERS += generictiltsensor.h
+
+SOURCES += main.cpp\
            generictiltsensor.cpp
+DEFINES += QTSENSORS_GENERICTILTSENSOR
+
+!blackberry {
+    HEADERS += genericorientationsensor.h\
+               genericalssensor.h
+
+    SOURCES += genericorientationsensor.cpp\
+               genericalssensor.cpp
+    DEFINES += QTSENSORS_GENERICORIENTATIONSENSOR QTSENSORS_GENERICALSSENSOR
+}
+
+!blackberry:!android {
+    HEADERS += genericrotationsensor.h
+
+    SOURCES += genericrotationsensor.cpp
+
+    DEFINES += QTSENSORS_GENERICROTATIONSENSOR
+}
 
 OTHER_FILES = plugin.json