diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-16 03:02:19 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-16 03:02:20 +0100 |
| commit | dc6b519f08916b8e48d27700e87c3e355fffbd33 (patch) | |
| tree | c8cbb144f962245f3c8adaf402e95c3b8145fde0 /src | |
| parent | ad7bcebc575922fc7c5654c118794e5758d347d2 (diff) | |
| parent | 633b0f40ca82709863bad48e0ed6a1c92ad3b8b4 (diff) | |
| download | qtlocation-dc6b519f08916b8e48d27700e87c3e355fffbd33.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ibf40dee29026002ce435e4b316ed999e320e73b6
Diffstat (limited to 'src')
| -rw-r--r-- | src/location/configure.json | 1 | ||||
| -rw-r--r-- | src/plugins/position/position.pro | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/location/configure.json b/src/location/configure.json index 90565052..62ab0297 100644 --- a/src/location/configure.json +++ b/src/location/configure.json @@ -41,6 +41,7 @@ "purpose": "Provides access to the Mapbox vector maps", "section": "Location", "condition": [ + "features.gui", "features.opengl", "features.c++14", "!config.intel_icc && (!config.win32 || config.mingw)" diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro index 6800d5a3..412bafe8 100644 --- a/src/plugins/position/position.pro +++ b/src/plugins/position/position.pro @@ -2,8 +2,8 @@ TEMPLATE = subdirs QT_FOR_CONFIG += positioning-private -linux:qtHaveModule(dbus):SUBDIRS += geoclue -linux:qtHaveModule(dbus):SUBDIRS += geoclue2 +linux|freebsd|openbsd|netbsd:qtHaveModule(dbus):SUBDIRS += geoclue +linux|freebsd|openbsd|netbsd:qtHaveModule(dbus):SUBDIRS += geoclue2 qtConfig(gypsy):SUBDIRS += gypsy qtConfig(winrt_geolocation):SUBDIRS += winrt qtHaveModule(simulator):SUBDIRS += simulator |