summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix NMEA time parsing errorOleg Evseev2017-05-161-1/+1
| | | | | | | | | Before this patch parsing time strings with less than 3 digits for number of milliseconds gave the wrong time result. Task-number: QTBUG-60814 Change-Id: Iab354bf47c0f7def3752326fe3ef2845d4be31c1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* gypsy: fix initialization order warningShawn Rutledge2017-05-121-1/+1
| | | | | | | | | | | | | | | | | | | Warnings are fatal nowadays. In file included from qtlocation/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp:40:0: qtlocation/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h: In constructor ‘QGeoSatelliteInfoSourceGypsy::QGeoSatelliteInfoSourceGypsy(QObject*)’: qtlocation/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h:136:12: error: ‘QGeoSatelliteInfoSourceGypsy::m_requestOngoing’ will be initialized after [-Werror=reorder] bool m_requestOngoing; ^~~~~~~~~~~~~~~~ qtlocation/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h:134:14: error: ‘QTimer QGeoSatelliteInfoSourceGypsy::m_requestTimer’ [-Werror=reorder] QTimer m_requestTimer; ^~~~~~~~~~~~~~ qtlocation/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp:143:1: error: when initialized here [-Werror=reorder] QGeoSatelliteInfoSourceGypsy::QGeoSatelliteInfoSourceGypsy(QObject *parent) : QGeoSatelliteInfoSource(parent), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I69b7923ce97a66baaee4e24b075e4d942e3e15f5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix for mobile maps from the HERE plugin not showing in low-dpiPaolo Angelelli2017-05-081-1/+8
| | | | | | | | Apparently these maps support only 250ppi or more. Task-number: QTBUG-60545 Change-Id: Iadb59c4f034cbfd94a825048358583f3a978315f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add a way to skip showing tilesPaolo Angelelli2017-05-084-7/+28
| | | | | | | | | | | | | | | In certain cases servers provide tiles that can be fully transparent, provide no content or are bogus. Tile fetchers can be smart and detect some of these cases. This patch offers an extensible way to allow them to communicate (via a null QImage) tiles that should not be rendered, in addition to an extensible mechanism to identify such tiles on disk. The default way is by assuming that, once such tiles have been detected, the tile fetcher would simply write a file with "NoRetry" as content. Change-Id: I404bb4dcc38fdd33c412f7407601b47947e4ce8d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Workaround for QGeoFileTileCache losing contentv5.9.0-beta4Paolo Angelelli2017-05-071-2/+4
| | | | | | | | | This patch disables the queue persistence, that causes the cache to fail indexing valid content present in the cache on disk Task-number: QTBUG-60581 Change-Id: Iec3ba6105fe59a6f466bfabf0db4bf4fc00267af Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add pluginName to QGeoMapType and check against it in setActiveMapTypePaolo Angelelli2017-05-0711-82/+111
| | | | | | | | | | | This patch adds a QByteArray member to QGeoMapType with the name of the plugin providing that map type. This value is then used to validate what is passed to QDeclarativeGeoMap::setActiveMapType to see if it's a map type for the currently set plugin. Change-Id: If15b67c32150f0c3c2815d28e26fc37138d4cf71 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix QDeclarativeGeoMap::visibleRegion when map is rotated/tiltedPaolo Angelelli2017-05-031-3/+6
| | | | | | | | This patch attempts to return something meaningful from that method also when the map is rotated/tilted, while waiting for QGeoPolygon. Change-Id: Id14853f2078ed399cf7f2c603ae7442489c07829 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix for MapGestureArea pinch and scroll wheel not honoring min zoomPaolo Angelelli2017-05-033-4/+23
| | | | | | | | | This patch fixes a regression introduced with e81ba34a98b259723e783e2d2df4321309992291, which made possible to zoom below the minimum valid zoom level for a viewport size. Change-Id: I4e71530b9bc5423ea24083146963c3bd0928f14a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Evaluate the visible region lazily in QGeoProjectionWebMercatorPaolo Angelelli2017-05-032-6/+19
| | | | | | | | | | | | | | This change optimizes QGeoProjectionWebMercator::setupCamera, factoring out the code that calculates the visible region, and replacing it with a dirty flag. The computation is deferred to the first time visibleRegion() gets called. This is done because the visible region is currently only used to render some types of map items, meaning that in a multi layer setup, only few layers might need it. Change-Id: I5dd75969581513eb60e3cf5d6ba649349bf25378 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix build on OpenSuSE 13.2 + GCC 4.9Thiago Marcos P. Santos2017-05-031-0/+0
| | | | | | | | Changes on Mapbox GL to make GCC 4.9.0 happy. Task-number: QTBUG-60378 Change-Id: Id5ba2e725caa8b54fee651a21ff76c81af02da43 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Move QGeoRectangle definition inside qgeorectangle.hPaolo Angelelli2017-05-037-88/+89
| | | | | | Change-Id: I7d0bb4eac89ca9a018f71faa9d73f62d97a24085 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Make error_messages.h privatePaolo Angelelli2017-05-0215-16/+25
| | | | | Change-Id: Iba33d12fad113b64cb071f0542a2c92034ff755d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Fix prefetching documentation for pluginsPaolo Angelelli2017-05-024-4/+8
| | | | | | | | | | Depending on the plugin, and the map type, the prefetching parameter might be overridden for specific reasons. This patch changes the description of prefetching stating that this parameter is a hint for the engine, that might get ignored. Change-Id: Iba68ed735f48ffaca19622b8f8933a44aa257c90 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Enable Mapbox GL plugin on MinGW buildsThiago Marcos P. Santos2017-04-285-1/+37
| | | | | | | | | | | | Qt CI is using MinGW 5.3.0 that should do the job compiling Mapbox GL. For now, only the ANGLE OpenGL backend is supported on Windows for this plugin. I.e. you need to set QT_OPENGL=angle or Qt::AA_UseOpenGLES. Task-number: QTBUG-60110 Change-Id: Iebd4d1569191f47a14b264c489b5d3fb23338d78 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix for nearest scaling still being used in overzoomPaolo Angelelli2017-04-281-0/+1
| | | | | | | | An assignment was missing to make the overzooming bool actually kick in. Change-Id: I5f6e52016026af050c734bca31e45f06fbbdb9b5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Make QGeoTileFetcher::handleReply virtualPaolo Angelelli2017-04-281-1/+1
| | | | | | | | Tile fetchers may need to override this one to better analyze the reply content and possibly validate it. Change-Id: Ia3445017ad7b44d719a1ce28b811d9145373e397 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Doc: correct link issueNico Vertriest2017-04-261-2/+2
| | | | | | | positioning.cpp: cannot link to 'geoshape.contains' Change-Id: I610dfe90432a224b2e20825c68d24c795774ae09 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Fix build for -no-feature-temporaryfileStephan Binner2017-04-251-1/+1
| | | | | Change-Id: Ic269e15b8044e319ff095cc758f20ebc02dda714 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* winrt: Add error handling for GeoPositionInfoSource creationOliver Wolff2017-04-243-8/+26
| | | | | | | | | | | If something goes wrong while creating the source, the factory should return a nullptr (same as in QGeoPositionInfoSourceFactoryGipsy). One such error might be, that access to location is denied on first application start. Task-number: QTBUG-60299 Change-Id: I50e87895a74bcff856aa29a195762a83466bc5b9 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Update Mapbox GL styles to the latest versionv5.9.0-beta3Thiago Marcos P. Santos2017-04-201-3/+3
| | | | | | | Better cartography and visuals. Change-Id: I1d751beeafc216351c1f7459a270d48f67693295 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update Mapbox logoThiago Marcos P. Santos2017-04-201-0/+0
| | | | | | | Mapbox released a new logo today. Change-Id: I15d271762a492d142571f6cae3920af30e04aaa6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix includeStephan Binner2017-04-201-1/+1
| | | | | Change-Id: Ie7885751121944544465d7efbf38c6744f9e30da Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix build for -no-feature-wheeleventStephan Binner2017-04-194-0/+10
| | | | | Change-Id: I69246dcaeda841892b1efe182725629517031447 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Fix build for -no-feature-cssparserStephan Binner2017-04-191-0/+2
| | | | | Change-Id: I06c0c1ad4744cd91a116906d7e7725f05cc35688 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Fix build for -no-feature-texthtmlparserStephan Binner2017-04-191-0/+16
| | | | | Change-Id: I9ab2c7b494aff0059f871a2bedee414559272a73 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Fix build for -no-feature-concurrentStephan Binner2017-04-191-1/+5
| | | | | Change-Id: I42e67c0af0b0658d6f1a876191e561d86aaa3ae8 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-182-3/+3
|\ | | | | | | Change-Id: I8ce0a0994d57fb077be4b6771f219bfc4134aa22
| * Doc: corrected link to Models and Views in Qt QuickNico Vertriest2017-03-142-3/+3
| | | | | | | | | | Change-Id: I8a6e6a34ea22b5ba96b46f05e970cdaa91dbc6b4 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Clarify overzoomEnabled property of QGeoCameraCapabilitiesv5.9.0-beta2Paolo Angelelli2017-04-122-1/+11
| | | | | | | | | | Change-Id: If6f8fd446c562d6ccaf368e1d5afb5eee113fece Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix export in QGeoCameraCapabilitiesPaolo Angelelli2017-04-121-2/+2
| | | | | | | | | | Change-Id: I1fff4d22c11c540b955abbfeb0707c8622291bef Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Allow overzooming when setting zoomLevel directly in a MapPaolo Angelelli2017-04-128-8/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves the lower/upper bound check on setZoom from QDeclarativeGeoMap to the gesture area, allowing to set higher zoom levels than the maximumZoomLevel when setting Map.zoomLevel directly, for the map types that support overzoom. This is now safe as the bound check is introduced in the tile fetcher, so no invalid tiles will be requested, and is beneficial when combining layers supporting different maximum zoom levels. Change-Id: I08ee9c282ee2ebc1dafa3c68a238b93ffbc1ba02 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix for copyright notice not showing before map type is changedPaolo Angelelli2017-04-121-1/+19
| | | | | | | | | | | | Task-number: QTBUG-58801 Change-Id: I2a980c6d218d0d7e44277f7b31fcdd7355e31698 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bound check QGeoTileSpec against min/max ZL before requesting itPaolo Angelelli2017-04-129-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now we have not honored the min/max zoom levels specified in QGeoCameraCapabilities when requesting tiles. As a result we have often fired requests for non-existing tile layers. This change complements the added support for individual camera caps for each map type, and makes the tile fetcher honor the bounds defined in the camera capabilities. This also allows to set larger zoom levels in the renderer, overzooming existing tiles, without the fetcher firing requests for invalid resources Change-Id: Ic8a523a114147109f7ef8af3510a3ab78d06d714 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Replace QGeoMapType argument of cameraCapabilitiesPaolo Angelelli2017-04-125-11/+11
| | | | | | | | | | | | | | | | | | | | Since the only part of QGeoMapType used in the method is mapId, there's no need to pass the whole map type as argument. The benefit is that the camera caps can be requested solely based on the info in QGeoTileSpec. Change-Id: Iafd0e2a1d4d45fbf02b862efe56841001cbebd75 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Mark qtlocation as warning-freeThiago Macieira2017-04-121-0/+3
| | | | | | | | | | | | | | | | | | This will turn -Werror on for our tested compilers, to avoid introducing new warnings. Change-Id: I27b55fdf514247549455fffd14b17ae6dce9976f Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Remove QtGui dependency from QDoubleMatrix4x4Alex Blasche2017-04-113-1/+3
| | | | | | | | | | | | | | | | | | This fixes the -no-gui build. Task-number: QTBUG-60062 Change-Id: I71400dfddac8ddf6a74906be8ba1272bf4a86781 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix itemsoverlay .pro file structurePaolo Angelelli2017-04-111-2/+3
| | | | | | | | | | | | | | | | This patch makes the structure of the pro file of the itemsoverlay plugin the same as the other plugins (like the mapbox plugin). Change-Id: Iada6296562282b238c6f793b9f0b80ade8ec6ddf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix size conversion warningsThiago Macieira2017-04-111-2/+2
| | | | | | | | | | | | | | | | | | Found by MSVC 2015 qclipperutils.cpp(65): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data Change-Id: I523b0abacd5148b2bf08fffd14b41a36046adafa Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Prevent accessing invalid QGeoTileSpec from QHash look-upsPaolo Angelelli2017-04-111-9/+13
| | | | | | | | | | Change-Id: Ic169824201ed6aeaeb2a482b28da989f9312181d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Prevent containers from detaching within for loops in QGeoTiledMapScenePaolo Angelelli2017-04-111-6/+6
| | | | | | | | | | Change-Id: I7f81f3dab3ef0243c45ec22bafa8687f756134f4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Replace foreach with ranged for loops in QGeoTiledMapScenePaolo Angelelli2017-04-111-8/+8
| | | | | | | | | | Change-Id: I7a82c0d63f35d1cfd264801e58089408254757c8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Prevent QList detaching in for loops in QDeclarativeGeoMapPaolo Angelelli2017-04-111-3/+3
| | | | | | | | | | | | | | Using qAsConst where possible to prevent QList from detaching. Change-Id: Ief03fb17761e350335f945b7134cf4a9266971d7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Protect QGeoMap pointer with QPointerPaolo Angelelli2017-04-114-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | m_map inside QDeclarativeGeoMap is created, but also destroyed, by the engine. In some cases (dynamic QML object creation/destruction) the engine may disappear before the Map. This patch introduces a QPointer to prevent a dangling pointer Change-Id: Ice3c57b4dbeb96ee8d7e4d401654b9085c105dec Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix DLL linkage of operator>>(QDataStream, QDoubleMatrix4x4)Thiago Macieira2017-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | It's marked as exported from QtGui, yet the implementation is in qdoublematrix.cpp. That cannot be. Found by MSVC 2015: qdoublematrix4x4.cpp(1097): warning C4273: 'operator >>': inconsistent dll linkage qdoublematrix4x4_p.h(939): note: see previous definition of '>>' Change-Id: I523b0abacd5148b2bf08fffd14b419faf3d1e584 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix linking error when building Mapbox GL plugin with ICUThiago Marcos P. Santos2017-04-101-4/+4
| | | | | | | | | | | | | | | | Mapbox GL depends on ICU, so it should be after -lqmapboxgl in the linker command line. Change-Id: I725d32d1132520ddd0704c7d9e998453a92e10ab Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Add geopath qml basic type documentationPaolo Angelelli2017-04-101-0/+32
| | | | | | | | | | | | | | Change-Id: I4f0b09cb8aac0b4d4f2d27cf350a30b7ed800f11 Reviewed-by: Nico Vertriest <nico.vertriest@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Doc: Complete parameter documentationNico Vertriest2017-04-103-3/+5
| | | | | | | | | | | | | | | | | | | | | | qdeclarativegeomap.cpp: 1327: warning: Can't link to 'Component.onCompleted' qgeopath.cpp:117: warning: Undocumented parameter 'width' in QGeoPath::QGeoPath() qgeopath.cpp:117: warning: Undocumented parameter 'path' in QGeoPath::QGeoPath() qgeoshape.cpp:90: warning: Undocumented enum item 'PathType' in QGeoShape::ShapeType qgeoshape.cpp:231: warning: No such parameter 'QGeoRectangle' in QGeoShape::boundingGeoRectangle() Change-Id: Ie57dff2aabe82d61b8122362a396ac706939c3b3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Rename libclipper namespaceThiago Marcos P. Santos2017-04-106-17/+17
| | | | | | | | | | | | | | | | | | | | | | So it won't clash with the libclipper used by the Mapbox GL plugin when linking Qt with -static. With -static, all the plugins are linked together instead of each one having its own shared library, thus, hiding private symbols. Change-Id: I33ee4afd4b83741c5f3fae32a88da7f4a7fee75f Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Trigger manually map update after initializationKarol Polak2017-04-101-0/+6
| | | | | | | | | | | | | | | | If all of the tiles were loaded from cache and plugin for the map was set after creation of the declarative map, it can occur that item is not updated Task-number: QTBUG-60021 Change-Id: I260b6219b65ef16726aa767d3a83c6fc756642b5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Mapbox GL static/debug build fixesBruno de Oliveira Abinader2017-04-072-1/+1
| | | | | | | | | | | | Task-number: QTBUG-59281 Change-Id: I3605265ca9c330ea782bdda53ce5af004ef35a22 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
View Lorry Controller Status