diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-01-07 15:15:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-07 15:17:42 +0100 |
| commit | 18b2dce9a8cbf49c6f2f7bf62698eb19649622ca (patch) | |
| tree | 3db7ffffa97bb64a021455cee932d94a868c1e7c /examples | |
| parent | 1177b517e80af7623bd1c094e731da2a4333dc51 (diff) | |
| parent | eca7ffd4f8539292aed40b81284e0cd81f80c998 (diff) | |
| download | qtlocation-18b2dce9a8cbf49c6f2f7bf62698eb19649622ca.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
src/imports/location/location.cpp
src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp
Change-Id: I0c1ce33cff7bb1a65e65b8adafd2b31eb936d515
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/location/mapviewer/mapviewer.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro index 90d85e62..d49258a2 100644 --- a/examples/location/mapviewer/mapviewer.pro +++ b/examples/location/mapviewer/mapviewer.pro @@ -5,6 +5,11 @@ QT += qml network quick positioning location CONFIG += qtquickcompiler SOURCES += main.cpp +# Workaround for QTBUG-38735 +QT_FOR_CONFIG += location-private +qtConfig(geoservices_mapboxgl): QT += sql opengl +qtConfig(geoservices_osm): QT += concurrent + RESOURCES += \ mapviewer.qrc |