diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 13:41:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 13:41:11 +0100 |
| commit | e3de1d31fe05455f1f22085bb3607047d8ba718d (patch) | |
| tree | ef7ea9ac0cdab88d953af7796e52c22a0e49b4c5 /src/plugins/sensors/sensors.pro | |
| parent | 5809a8b0ec112ced99d34c9670d097f1f0dc3171 (diff) | |
| parent | 97cf3d27e6e9771690b1ea29e09f06d4376ffcab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/sensors/generic/generictiltsensor.cpp
src/sensors/qtapsensor.h
sync.profile
Change-Id: I017a5fa8dffb69b41727495175c0fca9b76962e1
Diffstat (limited to 'src/plugins/sensors/sensors.pro')
| -rw-r--r-- | src/plugins/sensors/sensors.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/sensors/sensors.pro b/src/plugins/sensors/sensors.pro index 2edbb362..a8b59b0d 100644 --- a/src/plugins/sensors/sensors.pro +++ b/src/plugins/sensors/sensors.pro @@ -5,7 +5,6 @@ TEMPLATE = subdirs blackberry { isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = blackberry generic } - isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, dummy):SUBDIRS += dummy isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, generic):SUBDIRS += generic isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, simulator):simulator:SUBDIRS += simulator |