diff -r 90517678cc4f -r 453da2cfceef qtmobility/plugins/sensors/sensors.pro
--- a/qtmobility/plugins/sensors/sensors.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/sensors.pro	Fri May 14 16:41:33 2010 +0300
@@ -2,35 +2,23 @@
 
 include(../../common.pri)
 
-device_plugin=0
 maemo5 {
-    device_plugin=1
     SUBDIRS += n900
 }
 
 symbian {
-    exists($${EPOCROOT}epoc32/release/armv5/lib/SensrvClient.lib) {
-        message("Sensor framework found")
-        device_plugin=1                                                    
+    equals(sensors_symbian_enabled,yes) {
+        SUBDIRS += symbian
+    } else:equals(sensors_s60_31_enabled,yes) {
+        SUBDIRS += s60_sensor_api
     } else {
-        exists($${EPOCROOT}epoc32/release/armv5/lib/RRSensorApi.lib) {
-            message("Sensor API found")
-            device_plugin=1
-            SUBDIRS += s60_sensor_api
-        } else {
-            message("No native sensor interface found")
-            device_plugin=0
-        }
+        message("No native sensor interface found")
     }
 }
 
 SUBDIRS += generic
 
-!equals(device_plugin,1) {
-    # Create some dummy sensors to help out with testing
-    SUBDIRS += dummy
-}
-
+# Allow forcing extra plugins to build even if they won't run
 BUILD_ALL_PLUGINS=$$(BUILD_ALL_PLUGINS)
 equals(BUILD_ALL_PLUGINS,1) {
     SUBDIRS *= n900 dummy