From 11140e6cb085836255877e141e0a32d61f679b7b Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 4 Apr 2014 10:26:12 +0200 Subject: Simplify the detection of a QtSimulator build We don't need the cumbersome CONFIG+=simulator flag. Now we automatically build it. Change-Id: Iab20816856ec1d79965b980a17e668d04d3d9258 Reviewed-by: Rainer Keller Reviewed-by: Alex Blasche --- src/plugins/position/position.pro | 2 +- tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro index 293b4b03..0e2f9a5d 100644 --- a/src/plugins/position/position.pro +++ b/src/plugins/position/position.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs config_geoclue:SUBDIRS += geoclue config_gypsy:SUBDIRS += gypsy -simulator:SUBDIRS += simulator +qtHaveModule(simulator):SUBDIRS += simulator blackberry:SUBDIRS += blackberry ios:SUBDIRS += corelocation android:!android-no-sdk:SUBDIRS += android diff --git a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro index ea6c929f..1fb72da7 100644 --- a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro +++ b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro @@ -13,5 +13,5 @@ QT += positioning testlib # Define whether a satellite source is available. This must match the logic in # src/location/location.pro or the test will fail on some platforms. -simulator:DEFINES += SATELLITE_SOURCE_AVAILABLE +qtHaveModule(simulator):DEFINES += SATELLITE_SOURCE_AVAILABLE DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3