diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-09-22 11:36:33 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-09-22 11:36:33 +0200 |
| commit | b4a065d70e86405bc658b54fffad7c69a12f27aa (patch) | |
| tree | 46f2efb8c67188e41aa2b72870a5b2415dbbbacc /src/plugins/position/position.pro | |
| parent | f983215417a8128010b156ab0371380563fa1a4a (diff) | |
| parent | 116b41eed67ca923ca205d2c7aa0776b0eaa1a4e (diff) | |
| download | qtlocation-b4a065d70e86405bc658b54fffad7c69a12f27aa.tar.gz | |
Merge remote-tracking branch 'gerrit/5.6' into dev
Conflicts:
tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro
Change-Id: I1cd05c8e9c9e55edc0d2d1c2b967d94a9efd0394
Diffstat (limited to 'src/plugins/position/position.pro')
| -rw-r--r-- | src/plugins/position/position.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro index 8374a489..3886eb4d 100644 --- a/src/plugins/position/position.pro +++ b/src/plugins/position/position.pro @@ -1,9 +1,9 @@ TEMPLATE = subdirs -config_geoclue:SUBDIRS += geoclue +qtHaveModule(dbus):SUBDIRS += geoclue config_gypsy:SUBDIRS += gypsy qtHaveModule(simulator):SUBDIRS += simulator -ios:SUBDIRS += corelocation +osx|ios:SUBDIRS += corelocation android:!android-no-sdk:SUBDIRS += android winrt:SUBDIRS += winrt |