summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation error without openglPaolo Angelelli2017-06-181-0/+2
| | | | | | | | If opengl is not present, now that warnings are error, Location fails to build due to an unused ogl variable. Change-Id: Id1e9a1f4da8bc31a65e29b3dd2770250284d02bb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Use QDeclarativeGeoMapItemBase objectName to create mapboxgl item idPaolo Angelelli2017-06-182-4/+5
| | | | | | | | | | With this patch is now possible to predict what's the layer name that the mapboxgl plugin is generating for a specific map item, if that item has the objectName set. Change-Id: I7726e44c6b0cc981d30e7725326075025f49af30 Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix add/removeMapItemGroup not checking if the item is added to a mapPaolo Angelelli2017-06-183-6/+20
| | | | | | | | | Currently these methods aren't checking if a group is already added to another map. This patch fixes it. Change-Id: I58a5e633b44abfcae5c362f8e97d4c6706869ac5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix MapQuickItems w/o zoomLevel sticking around when behind the cameraPaolo Angelelli2017-06-141-3/+14
| | | | | | | | | | | | This patch fixes the case when rendering a map with MapQuickItems in it that have the zoomLevel property not set and using a tilting angle. Without the patch, in some scenarios the items may stick around on the screen while they should simply go away. Change-Id: Ic485ecf5851d27a0248ff1745ae552bbb81423ba Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix for QDeclarativeGeoMapCopyrightNotice crashing the applicationPaolo Angelelli2017-06-142-6/+16
| | | | | | | | Some pointers were used without prior check. This adds checks where necessary. Change-Id: I82e01b72fd3a46a6add7cf286e81686b686b272b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix Map.addMapItemGroup documentationPaolo Angelelli2017-06-121-3/+1
| | | | | | | Items in map item groups are not reparented anymore. Change-Id: I1d083bf8cba5aa46e8640c175bf90aa9f04b69aa Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix for GeocodeModel documentationPaolo Angelelli2017-06-091-3/+3
| | | | | | | Links to Location QML element are broken Change-Id: Iffda8fd8c8cdd9e00e45592ee2f0e971865defb9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix incorrect Map.visibleRegion when all the map is visiblePaolo Angelelli2017-06-091-1/+11
| | | | | | Change-Id: I9d532416e0e6dd06f84216d97bcf160e3e8e43be Task-number: QTBUG-57690 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update QtPositioning qmltypes definitionPaolo Angelelli2017-06-091-3/+27
| | | | | Change-Id: Ic45f7c8aa819d373e96cf60082fcda95a63f79b8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix for non-existing QtPositioning 5.9Paolo Angelelli2017-06-081-4/+4
| | | | | | Change-Id: I5190564ef3e4a25f1e387c8918ec269a0a52bbea Task-number: QTBUG-61266 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update QtLocation qmltypes definitionAlex Blasche2017-06-061-3/+163
| | | | | Change-Id: I675167f90579f9999d3e1d3cba42951bd5b7ea3b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix for incorrect QGeoPathPrivate::containsPaolo Angelelli2017-06-061-1/+1
| | | | | Change-Id: I4067d6df69aad0af9495a29532a34f0a7e992596 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add unnecessary break to keep GCC 7 happyThiago Macieira2017-06-061-0/+1
| | | | | | | | | | | Falling through or breaking have the same effect, since the next case label repeats the same condition in the "if", which must necessarily be false for the code to have fallen through. qdeclarativesearchresultmodel.cpp:632:9: error: this statement may fall through [-Werror=implicit-fallthrough=] Change-Id: Ia3e896da908f42939148fffd14c48127381f219d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add mean to create qgeopath in locationsingletonPaolo Angelelli2017-06-052-0/+44
| | | | | | | | | As currently there is no way to create a pre-filled qgeopath, this patch adds an overload to QtPositioning.geopath() to pass parameters to the constructor. Change-Id: I05af4dbef07bd62e9e2eace7105b5255e8a392fa Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix documentation for return types from QJSValue to the actual QML typePaolo Angelelli2017-05-313-3/+3
| | | | | Change-Id: I6db1f0db07de3bb9446f0b04ea95f34b56acf805 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix build when OpenGL is disabledThiago Marcos P. Santos2017-05-301-1/+1
| | | | | | | | | Make OpenGL a requirement for the Mapbox GL plugin. Task-number: QTBUG-61087 Change-Id: I8d8224f14fdff01c03d48991c4ff704d74e70234 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Check for validity in QDeclarativeGeoMapQuickItem::setCoordinatePaolo Angelelli2017-05-291-1/+1
| | | | | | Task-number: QTBUG-61070 Change-Id: I610a943e9aeaa2129b87bfd4e4f5afa391bc7c31 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Refactor: move code not depending on "this" into static methodsPaolo Angelelli2017-05-292-57/+70
| | | | | | | | | | | This patch moves the implementation of the default filenameToTileSpec and tileSpecToFileName methods into standalone public static methods so that they can be possibly reused by plugins or other components, since these implementations do not actually depend on any member of QGeoFileTileCache. Change-Id: I6e3f59615ff3a5e0924f946aa13aabebb8157e42 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Make it possible to MapItems to rendered under some style layersThiago Marcos P. Santos2017-05-258-9/+40
| | | | | | | | | Add a MapParamter to specify the default "before" layer for MapItems that Mapbox GL can render. This can be used for inserting route lines before labels. Change-Id: I3ee414ee8af31f38b74c95b3ecc31df6085bed30 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* More detailed attribution file for Mapbox GLThiago Marcos P. Santos2017-05-251-0/+0
| | | | | | | | | Add individual entries for all the Mapbox GL own dependencies used when building the Mapbox GL plugin. Task-number: QTBUG-60821 Change-Id: I1da2617eed6eabd3ef35c6b23db3418bf56370a0 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.9.0' into 5.9" into ↵Liang Qi2017-05-244-4/+8
|\ | | | | | | refs/staging/5.9
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-234-4/+8
| |\ | | | | | | | | | Change-Id: I122bd675639baca961882ec9d512900f4e7e773b
| | * Document MapboxGL plugin API to be Tech Previewv5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Paolo Angelelli2017-05-191-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: I2444bacedb230101bfef615db1f5c10252b6f367 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com>
| | * Fix compile due to change in private API in qtdeclarativeJan Arve Saether2017-05-191-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0c30279ec1fad88346ed3fb483bc3c672fdd01b in qtdeclarative changed some private APIs, so we need to adjust code correspondingly. Task-number: QTBUG-57253 Change-Id: I0cf30b5f4aaf5c040d72a384d87b0fe277a84d27 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
| | * mapboxgl: Fix dynamic opengl buildOliver Wolff2017-05-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default in Qt was changed back to ANGLE being split into libEGL and libGLESv2. mapboxgl now supports both both configurations - having two libraries and combining them into QtANGLE. Task-number: QTBUG-60795 Change-Id: Id3297ed295b20872bc0693b8cd3596a03e739b98 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| | * Fix build on Android with clangThiago Marcos P. Santos2017-05-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt builds Android with clang using libstdc++ instead of libc++. This bumps mapbox-gl-native to a version with a fix that takes that into account. Task-number: QTBUG-60533 Change-Id: I7379cbb43623a745d221cbcdb8bf748486e6cbac Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Use appropriate qmake flags for optimizationsAllan Sandfeld Jensen2017-05-243-11/+12
|/ / | | | | | | | | | | | | | | | | | | Using optimize_full gives us -O3 also on icc and clang, and -O3 already implies -ftree-vectorize, and -ffast-math already implies unsafe-math- optimizations. Change-Id: Ieb1a6841da1ea3513ae624bf2468554bc62318c9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix incorrect condition in QDeclarativeGeoMap::geometryChanged()Paolo Angelelli2017-05-231-1/+1
| | | | | | | | | | | | | | | | isEmpty should be used instead of !isValid, as 0,0 is a condition to skip as well. Change-Id: Ibbfa03b5a09fd0adf4b143d21674870301459f45 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix building on configurations without openglPaolo Angelelli2017-05-201-0/+4
| | | | | | | | | | | | Task-number: QTBUG-60881 Change-Id: Iffdcfe1ebfe81da9b809dceeff61fca044e94891 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix resources not loading on static buildsThiago Marcos P. Santos2017-05-208-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly call Q_INIT_RESOURCE, otherwise the resources are not found and the plugins using resources are broken when building Qt with -static. This patch also adds a prefix to these resources to avoid collision, since they are very generic like "logo.png" or "maps.json". Task-number: QTBUG-60007 Change-Id: Ifb73e9b97af107f2e24f5478f3de534bbd40e158 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | 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>
View Lorry Controller Status