diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-04-04 10:41:06 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 13:29:14 +0200 |
commit | b249c74338a69a7441708833565a6197412e55fa (patch) | |
tree | e5162634f362312376acee9d16beb614739f7744 /src | |
parent | 8b11ddef023a18d362a9b09eb794c3eee9c2d958 (diff) |
Simplify building of simulator based code
There is no need for the CONFIG+=simulator logic anymore.
qtHaveModule() is an automatic way of doing the same.
Change-Id: Ibe87abb93e036a82fae3a752d9886c58ccebeec1
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/sensors/sensors.pro | 8 | ||||
-rw-r--r-- | src/sensors/sensors.pro | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/sensors/sensors.pro b/src/plugins/sensors/sensors.pro index a566716a..3f35db5a 100644 --- a/src/plugins/sensors/sensors.pro +++ b/src/plugins/sensors/sensors.pro @@ -1,7 +1,5 @@ TEMPLATE = subdirs -# Don't build dummy plugins, the Blackberry backend has real implementations -# of these. This reduces compile time and plugin loading time. blackberry { isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = blackberry generic } @@ -22,9 +20,13 @@ winrt { isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = winrt generic } +qtHaveModule(simulator) { + isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = simulator 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 +isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, simulator):qtHaveModule(simulator):SUBDIRS += simulator isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, blackberry):blackberry:SUBDIRS += blackberry isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, linux):linux:SUBDIRS += linux isEmpty(SENSORS_PLUGINS)|contains(SENSORS_PLUGINS, android):android:SUBDIRS += android diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index e7ad05f5..13e83151 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 } |