From b249c74338a69a7441708833565a6197412e55fa Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 4 Apr 2014 10:41:06 +0200 Subject: 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 Reviewed-by: Alex Blasche --- src/plugins/sensors/sensors.pro | 8 +++++--- 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 a566716..3f35db5 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 e7ad05f..13e8315 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 } -- cgit v1.2.1