diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-19 12:51:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-19 12:51:18 +0100 |
| commit | 677833d418176e46babbd7720b1160ce789c7e2d (patch) | |
| tree | cb04512f506755506f5900729c34f3c2e2143590 /examples/location/mapviewer | |
| parent | 7d46b52172f2a53e99a8aad5e59dbe9fb4f8738c (diff) | |
| parent | b9d4da55cf0b775467df43c1d868dc4d58b96b45 (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
src/location/declarativemaps/qdeclarativegeomap.cpp
src/location/maps/qgeomap.cpp
src/location/maps/qgeomap_p_p.h
src/location/maps/qgeorouteparserosrmv5.cpp
src/location/maps/qgeotiledmap.cpp
src/positioning/positioning.pro
Change-Id: I42f8b176a8f3e824c7fe5b067a958735173f0dbb
Diffstat (limited to 'examples/location/mapviewer')
| -rw-r--r-- | examples/location/mapviewer/mapviewer.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro index d49258a2..8e3daf81 100644 --- a/examples/location/mapviewer/mapviewer.pro +++ b/examples/location/mapviewer/mapviewer.pro @@ -2,7 +2,6 @@ TARGET = qml_location_mapviewer TEMPLATE = app QT += qml network quick positioning location -CONFIG += qtquickcompiler SOURCES += main.cpp # Workaround for QTBUG-38735 |