summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-102-8/+0
|\ | | | | | | Change-Id: Ibd6d68ced4edbd96fb67fe61244b83d597df5775
| * Fix build with -no-feature-libraryUlf Hermann2017-03-062-5/+0
| | | | | | | | | | | | | | | | | | Drop unnecessary guards around QFactoryLoader (which is available without QLibrary) and drop an unused include. Change-Id: I0368eb857474fc728f1dad76977758b6d773f1d6 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Remove unused includesPaolo Angelelli2017-03-021-3/+0
| | | | | | | | | | | | | | | | These includes seem to block CI on some configurations Task-number: QTBUG-59243 Change-Id: I10e743302cd9e41036cd1e8e94746fd3b2d817d3 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Increase the QGeoCoordinate debug operator precisionAlex Blasche2017-03-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current precision of 6 digits only ever guarantees 110m on Earth. That's not sufficient for some use cases. A precision of 11 guarantees at least 8 digits after the comma since there are at most three digits before the comma. The 8th digit reflects a geographical precision of 1.1 mm on earth. More precision for navigation purposes is not needed. Task-number: QTBUG-59259 Change-Id: I4f59c152171c3a71f22aa7520718d0fcb611b697 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Guard against unprotected javaVM pointer usageAlex Blasche2017-03-091-1/+1
| | | | | | | | | | | | Task-number: QTBUG-59010 Change-Id: Iea5f160718fd668665d4870fe1b82d608cf13d8c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix MapQuickItem when zoomLevel is setPaolo Angelelli2017-03-084-5/+101
| | | | | | | | | | | | | | | | | | This patch fixes the behavior of MapQuickItem when the zoomLevel is set, that is it makes behave the qquickitem as if it would be on the map, instead of on the screen. Change-Id: Ibb8a6000e2f6a37a68c32df001fc8565079a6f70 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add itemsoverlay pluginPaolo Angelelli2017-03-0810-1/+592
| | | | | | | | | | | | | | | | | | | | | | This change adds a new plugin that does only offer an empty transparent map. The intended usage is to add overlay layers into which to place only map items. Change-Id: I51e64b0354f533bf73480e800e0d5338920a7fc5 Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Use $$MODULE_BASE_OUTDIR/lib in Mapbox GL nativeBruno de Oliveira Abinader2017-03-082-1/+2
| | | | | | | | | | | | Task-number: QTBUG-59281 Change-Id: Iec3a1fefb029e9eb0386b29b40e7844eba04bbd7 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Simplify the criterea for building the Mapbox GL pluginThiago Marcos P. Santos2017-03-071-19/+1
| | | | | | | | | | | | | | | | What we should really be looking for is if we can do C++14. Change-Id: I43ce71e02a397b970eb4e57b8c25aee99d4282e0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix -Wreorder warningPaolo Angelelli2017-03-072-4/+4
| | | | | | | | | | Change-Id: I5fcc43f3164e0eb83d1504e892d0ede9d54fe3ae Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix for map shaking during rotation gesture in presence of tiltingPaolo Angelelli2017-03-071-6/+6
| | | | | | | | | | | | | | | | This fix makes the reanchoring happen last, preventing the shaking effect when rotating off center on a tilted map Change-Id: I139a7839663ad04a9966f18821308957de562c9e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Remove dependency on QtWidgetsThiago Marcos P. Santos2017-03-063-5/+0
| | | | | | | | | | | | | | | | | | Mapbox GL Native was using QtOpenGL and that was pulling in the dependency on QtWidgets. Now we use only QtGui. Task-number: QTBUG-58821 Change-Id: Iae4c0d6de24988180fd8c837ff53ffc426831a30 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix line rendering when ending and joiningBruno de Oliveira Abinader2017-03-062-0/+35
| | | | | | | | | | | | Change-Id: I30e1ae3ec70e8ab36ef3344cecb7a66b1d37a952 Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Optimize QGeoProjectionWebMercator::wrappedMapProjectionToItemPositionPaolo Angelelli2017-03-061-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch bakes all the required linear transformations performed in the method inside a 4x4 double matrix, removing 4 of the 5 instructions previously performed. Autotest adaptations with compares instead of verifys have been necessary due to small epsilons in the results. Change-Id: I7795173a27812eb93a48e3175ad24fd546aeec04 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Add mapReady to notify when the map is readyThiago Marcos P. Santos2017-03-062-8/+20
| | | | | | | | | | | | | | | | | | This adds a mean to notify when the Map becomes truly ready. This property should always be used in place of listening on the Component completed() signal. Change-Id: I98db7a4fd1fea6e54f6e6eca7ac50f26f90276f5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | ICU support in Mapbox GL Native upon availabilityBruno de Oliveira Abinader2017-03-033-0/+17
| | | | | | | | | | | | | | Change-Id: I5102b3013263a3cb5158673b19ef7b89655d7fa7 Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com>
* | Fix typo in QMapboxGLStyleSetPaintProperty ctorBruno de Oliveira Abinader2017-03-031-1/+1
| | | | | | | | | | | | Change-Id: I804bd7077eb6fd99e4c2facbfb9c9b1d30ecc4fd Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Notify when the map is initializedThiago Marcos P. Santos2017-03-032-0/+9
| | | | | | | | | | | | | | | | | | This patch makes the map notify when the initialization is complete, and thus all the API functioning as expected, like fromCoordinate and toCoordinate. Change-Id: Idaebbcf910f32dd297bd5ebec6dffa166d015b4a Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Unwrap longitude in Mapbox GL when neededBruno de Oliveira Abinader2017-03-021-3/+24
| | | | | | | | | | | | | | This is in order to keep parity with Qt visual expectations. Change-Id: Iea758483972e53b8f42e352401390d95dd1c1407 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix clang compilation warningsBruno de Oliveira Abinader2017-03-012-3/+1
| | | | | | | | | | | | Change-Id: I972cd8bc307ffce9c8f7a56b76cfc0f025b7ad98 Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Remove tiltingSupported and bearingSupported propertiesPaolo Angelelli2017-02-282-33/+0
| | | | | | | | | | | | | | | | | | | | As these two properties would be deprecated in 5.10, this patch removes them, implicitly forcing all plugins to support tilting and bearing (or at least bearing, as tilting can be bounded via range). Task-number: QTBUG-58931 Change-Id: Iddec8cc225aaa656e8d509bd41b860f18956788a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge "Merge remote-tracking branch 'gerrit/5.8' into 5.9" into refs/staging/5.9Paolo Angelelli2017-02-285-40/+57
|\ \
| * \ Merge remote-tracking branch 'gerrit/5.8' into 5.9Alex Blasche2017-02-285-40/+57
| |\ \ | | |/ | | | | | | Change-Id: I3c27a0635fa324dfea7a1d19774a66e21c066bbe
| | * Fix null pointer exceptionPaolo Angelelli2017-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a null pointer exception happening when the application starts without network and then the network becomes available Change-Id: Iedeacf8fb8f350dfa92c05c1d2e16f62199ca5fd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Consider devicePixelRatio when enabling tiles mipmappingPaolo Angelelli2017-02-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Tiles are magnified when high dpi scaling factor is used for the app, so the scale factor must be considered when tile size is used to decide whether to switch mipmapping on or not Change-Id: I628ddc82f41bbdb94d0c1c6ed628bc13990f64bf Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * Reduce the amount of mutexed codePaolo Angelelli2017-02-281-2/+3
| | | | | | | | | | | | | | | Change-Id: Ic0dfe488ba8aafb0f3ca3a2b6209d59484d07af8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Clarify osm plugin documentationPaolo Angelelli2017-02-281-3/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-55176 Change-Id: Id70a5e501425c7581acc18f7d1aae1c33b42d7ba Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Fix incorrect handling of provider resolution for offline storagePaolo Angelelli2017-02-282-32/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the incorrect handling of the population/repopulation of OSM offline tiles when the providers are initially populated. In this way it is now fine if the user selects high dpi tiles, and has both high dpi and low dpi offline tiles, and the high dpi provider is unavailable. Change-Id: I4d7080d6f259663bf6ca7a985fd9784fb81cfec3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Do not create error when mapgl submodule is not checked outAlex Blasche2017-02-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I7251226b520bd3b296071c90420c648ac720cc2a Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Fix frustum footprint calculation in QGeoCameraTilesPaolo Angelelli2017-02-281-148/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old algorithm for computing the frustum footprint has problems with certain viewport sizes when tilting the map. This patch fixes the problem, and also removes the dependency on a local copy of qsort that was necessary in order for that algorithm to work properly. Task-number: QTBUG-58684 Task-number: QTBUG-34088 Change-Id: I36aaaa90c567cd19a4ae66dba8def0aec0b00534 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Make min/max Tilt/FieldOfView Read/WritePaolo Angelelli2017-02-282-54/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the currently read only properties minimumTilt, maximumTilt, minimumFieldOfView and maximumFieldOfView user-settable as well, like minimum and maximum zoom level. Autotests are included. Task-number: QTBUG-58931 Change-Id: I784be7bd0d960061e94bc40cd8a45e466754526f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Make QGeoCameraCapabilities independent of the enginePaolo Angelelli2017-02-2818-104/+269
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes it possible to change QGeoCameraCapabilites at runtime, when the map type changes, to accommodate for those plugins that offer different maps having different capabilities. This is then used to properly push the min/max zoom levels for each map type in our OSM plugin. Autotests are included. Change-Id: I48532da77ffb3eaf2e752561395945c3a2c21985 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Use qRadiansToDegrees() and qDegreesToRadians() more widelyEdward Welbourne2017-02-276-50/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They document intent more clearly (and replace *two* local hand-rolled versions of each). Also kill an extraneous #include of <math.h>; and switch to qmath.h as source for M_PI, replacing the M_PID value (and friends) previously provided by (thankfully private) qlocationutils_p.h (at more precision than even long double would retain - qmath.h's M_PI is entirely sufficient even for long double, as is the Linux <math.h> one). Task-number: QTBUG-58083 Change-Id: I6fa4abd3c8ed9c826998f2cdc2aefc51681c19c1 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix incorrect method invocation in QPlaceSearchReplyOsmPaolo Angelelli2017-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | A previous change removed the QPlaceReply:: prefix on setError, now causing to recursively call itself endlessly. This patch reverts the change. Change-Id: Iacf704760c970fab44490897ca1192b817814b83 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Use an ordered container for storing map itemsBruno de Oliveira Abinader2017-02-242-4/+3
| | | | | | | | | | Change-Id: I29988fb460881e3944e5aab9a2f4d0b542a578ef Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Warn when mapbox-gl-native submodule is not presentThiago Marcos P. Santos2017-02-241-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | If the mapboxgl plugin can be built (i.e. compiler support, opengl, etc is in place), fail the build if the submodule is not checked in and print a message on how to fix it. If the plugin is not supported, ignore it completely. Task-number: QTBUG-58939 Change-Id: I7fc05567921cd31fc26fa540ba5806f676e015fb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Better dependency tracking when building 3rdparty modulesThiago Marcos P. Santos2017-02-243-26/+13
| | | | | | | | | | | | | | | | | | | | | | | | Make the component using the 3rdparty module depend directly on the module instead of depending on the 3rdparty directory as a whole. This will speedup compiling time when doing parallel builds and make build more consistent when building only selected pieces of QtLocation. Task-number: QTBUG-58943 Change-Id: I95b5ef8302109fb0c5fad760027a7a53d021bfa4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Bump mapbox-gl-native package versionThiago Marcos P. Santos2017-02-201-0/+0
| | | | | | | | | | | | | | | | | | | | | | Fixed few nits caused by Mapbox GL Native 3rd party package when packaging Qt. Task-number: QTBUG-59035 Task-number: QTBUG-59027 Task-number: QTBUG-58864 Change-Id: I4fe1d985183c027e69303663839ae517a9c1a1be Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix support for MapParameters on Mapbox GL pluginThiago Marcos P. Santos2017-02-1710-340/+880
| | | | | | | | | | | | | | | | | | | | Mapbox GL plugin can now accept MapParameters, such as MapParameters used for the Mapbox runtime style API, allowing runtime changes on the map, not restricted only to style, but also adding new geometries and features. Change-Id: If0394bd044a2d3058fe5480966880a1055614ea2 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Move mapboxgl.use_fbo to the mapboxgl.mapping namespaceThiago Marcos P. Santos2017-02-172-3/+3
| | | | | | | | | | | | | | Follow the pattern, as this only affects how maps are rendered. Change-Id: Ieacc3df4149fb5045b15f2cee6d4521e93de5b6e Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Optional support for QSGMapboxGLRenderNodeBruno de Oliveira Abinader2017-02-167-23/+124
| | | | | | | | | | | | | | | | | | | | | | | | QSGMapboxGLRenderNode support is experimental: It doesn't support QQuickItem transforms nor stencil clipping. By default, QSGMapboxGLTextureNode is enabled. The user can select QSGMapboxGLRenderNode by setting 'mapboxgl.use_fbo' plugin parameter to 'false'. Change-Id: I3d5338990458f62fdbe7b8dc00317a85ee1ff188 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | OsrmV5: Point translators to github project with translationsFriedemann Kleint2017-02-151-0/+1
| | | | | | | | | | | | | | Add a Linguist comment containing the URL. Change-Id: Ied8e23b0fd7e645d4c6b1a1fa2f0d0d7de4530f8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | QGeoMapMapboxGL: Fix tr()-context of warningFriedemann Kleint2017-02-151-1/+1
| | | | | | | | | | | | | | | | QObject::tr() should not be used. Amends 68b515cdff46dc1030b027a664ef5f3f6cde946a. Change-Id: Id22f730d9bd09c41a22783d1b5530835e9fb0d1c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Remove moc_* inclusions from source filesPaolo Angelelli2017-02-1435-69/+1
| | | | | | | | | | | | Change-Id: I7385348d7b6ec22fa92ed1be65f89e262c38b5c0 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix export macro in private headersPaolo Angelelli2017-02-1417-39/+40
| | | | | | | | | | | | | | | | Changing Q_LOCATION_EXPORT to Q_LOCATION_PRIVATE_EXPORT in all _p headers to avoid confusion. Change-Id: Ic42d1c59f0cd68c27bcf40296c612d005da11efd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Remove unused includes from qgeorouterequest.cppPaolo Angelelli2017-02-141-3/+0
| | | | | | | | | | Change-Id: I45f8fdb5db7ad5bc71018cf87a945ce43260e226 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Support for Mapbox GL Native rendering of QML Map{Polygon,Polyline} itemsBruno de Oliveira Abinader2017-02-148-113/+330
| | | | | | | | | | | | | | | | | | | | | | | | Replaces Mapbox GL Native annotations with runtime styles API. Missing: - Map{Polygon,Rectangle} border width property - see QTBUG-58872 for details. - MapCircle support - see QTBUG-58869 for detais. Change-Id: I77c9daee813a63efc60104f94f440f00ac3cf70f Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-147-16/+21
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp Change-Id: I2428d360c07b55ec5ee61f81c6f97b3d7b20f363
| * Fix plugins documentation that makes the text exceed the column widthPaolo Angelelli2017-02-092-5/+5
| | | | | | | | | | Change-Id: I2a2b1dbba796153e77aaade0c41f128b6fb37adb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix HERE Plugin requesting invalid range when on high dpi modePaolo Angelelli2017-02-081-8/+12
| | | | | | | | | | | | | | Apparently HERE does not support ZL 0 and 20 when using 512x512 tiles Change-Id: Ic52f98648243ce866646d921e3fc70b494fed62c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>