summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-11-21 16:33:48 +0100
committerLorn Potter <lorn.potter@gmail.com>2014-12-18 01:11:46 +0100
commit649396eba96770b211ba2fc3053c53249220ca24 (patch)
tree36d4a6d819870a133f419fd88819a18fc21ea2f8
parent3285311a4f03cab8f14296ebdf7d1d100f6671cf (diff)
Do not install the dummy sensors plugin by default
The dummy sensors plugin will start fake sensors that emit 100 updates per second. This should not be the default sensor returned when a user requests a sensor. These sensors were default on Linux. Task-number: QTBUG-39475 Change-Id: Ia276e904f93dfeef95f7490ec7cb51cad260a2a8 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
-rw-r--r--src/plugins/sensors/sensors.pro6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/sensors/sensors.pro b/src/plugins/sensors/sensors.pro
index 3f35db5a..a66ed4a8 100644
--- a/src/plugins/sensors/sensors.pro
+++ b/src/plugins/sensors/sensors.pro
@@ -24,7 +24,11 @@ qtHaveModule(simulator) {
isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = simulator generic
}
-isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, dummy):SUBDIRS += dummy
+linux {
+ isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = linux generic
+}
+
+contains(SENSORS_PLUGINS, dummy):SUBDIRS += dummy
isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, generic):SUBDIRS += generic
isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, simulator):qtHaveModule(simulator):SUBDIRS += simulator
isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, blackberry):blackberry:SUBDIRS += blackberry