diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:15:55 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:15:56 +0200 |
| commit | 37fd0ee78f6321cd381bf6a4262214a26a29cf11 (patch) | |
| tree | d4ffaac197abafe3b411b8202514e3390b2aa906 /src/sensors | |
| parent | 533f147b297d716f1f995054c925917bbb0f4bb9 (diff) | |
| parent | e60743e095b8bb7fcc3f0de823d2a46aa68343d3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I07a6842afc72f56c82e82906429fa422f9a82de2
Diffstat (limited to 'src/sensors')
| -rw-r--r-- | src/sensors/sensors.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index 5ca3325a..a7f60e18 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -5,7 +5,7 @@ QT = core-private CONFIG(debug,debug|release):DEFINES += ENABLE_RUNTIME_SENSORLOG !isEmpty(SENSORS_CONFIG_PATH):DEFINES += "QTSENSORS_CONFIG_PATH=\\\"$$SENSORS_CONFIG_PATH\\\"" -simulator { +qtHaveModule(simulator) { DEFINES += SIMULATOR_BUILD QT += simulator } @@ -52,7 +52,7 @@ GESTURE_HEADERS += \ gestures/qsensorgesturemanagerprivate_p.h \ gestures/qsensorgestureplugininterface.h -simulator { +qtHaveModule(simulator) { SOURCES += gestures/simulatorgesturescommon.cpp GESTURE_HEADERS += gestures/simulatorgesturescommon_p.h } |