summaryrefslogtreecommitdiff
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
...
| * Blacklist flick tests on windowsPaolo Angelelli2017-02-101-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Flick tests results on windows are flaky in presence of high system load, due to the way testlib simulates flicking. This change blacklists them on windows, where the problem seems to be most severe. Task-number: QTBUG-56679 Change-Id: Ia4e1eb524af8280e8ed724216c0c118cf81f05db Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Correct spelling in autotest function namePaolo Angelelli2017-02-101-1/+1
| | | | | | | | | | | | | | Change filtetring into filtering Change-Id: Ib00a904df11bcab66805dc927f4c4b01d0de0cf4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Un-blacklist declarative-ui autotestsPaolo Angelelli2017-02-091-4/+0
| | | | | | | | | | | | | | | | Autotests are now all working, blacklisting not necessary anymore Change-Id: I2c9dc16a95f7b64b00228143ccfa31d1ae1645b6 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Binary compatibility file for qtlocation (5.8.0)Milla Pohjanheimo2017-02-061-0/+4425
| | | | | | | | | | | | | | Added binary compatibility file for qtlocation Change-Id: Iffeb7e66db62cba2935637e697ddb67798978a1c Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Allow to create maps with groups of map itemsPaolo Angelelli2017-01-313-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch lets a user create an external qml file, and put multiple map items inside a parent MapItemGroup{}, and add that element to a Map item. QDeclarativeGeoMap gets also two associated methods: addMapItemGroup and removeMapItemGroup to deal with item groups at runtime. Additionally, clearMapItems now clears also added item groups. Task-number: QTBUG-55211 Change-Id: Ie4e602e4bda65fb56422b721be5fd34c54eb7954 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Make QDeclarativeGeoMap::setVisibleRegion support all QGeoShapesPaolo Angelelli2017-01-261-2/+8
| | | | | | | | | | | | | | | | | | | | This patch uses QGeoShape::boundingGeoRectangle to set the visible region, supporting the new QGeoShapes, simplifying the logic in ::fitViewportToGeoShape, and not requiring updates if new QGeoShapes are added. Change-Id: I4f4c21bc0b62aae9432024d8f20db774d191255b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add rotation/tilting support to QGeoTiledMapScene/QGeoCameraTilesPaolo Angelelli2017-01-261-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds rotation and tilting support to QGeoTiledMapScene and QGeoCameraTiles. It also adds the related capabilities to the geoservice plugins mapping managers QML Api is added in a separate patch Change-Id: I3de1b52a9928c4856f6ee57ad39191acebe0f770 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add rotation and tilt controls to QDeclarativeGeoMapPaolo Angelelli2017-01-252-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeGeoMap currently does not provide any mean to set bearing and tilt into qgeocameradata. It has been not a problem since QGeoTiledMap and sons did not support it. External renderers however support it, so this patch adds QML api calls to control these parameters, and adapt the existing logic to take them into consideration in camera-related calls, as well as in the afterViewportChange handlers of the Map Items. This patch also sligthly modifies the QML api to make the handling of all the bounded camera property more homogeneous. Minimum and maximum zoom levels prior plugin initialization aren't -1 anymore, but are some valid lower and upper bounds for this property, that is 0 and 30. in this way all the 2 bounded properties (zoomLevel and tilt) behave the same, in that they can be freely set before plugin initialization, within reasonable predefined bounds, and, after that, they may be clamped depending on the actual plugin capabilities. Autotests for the QML part of the API included. Change-Id: I9d09e32698a7330388e465e8ea7523ee39577d34 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Move the coordinate <-> item position conversion to QGeoProjectionPaolo Angelelli2017-01-165-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies the QGeoMap API removing all the API necessary to convert to and from screen. This is now demanded to a specific QGeoProjection class, that will be independent of the map, except for using the same Geo projection (currently only WebMercator, or EPSG:3857, although we use a sphere instead of an ellipsoid, i believe) The benefits are - This relieves subclasses of QGeoMap from implementing a GeoProjection API, especially since QtLocation currently supports only WebMercator, and reimplementations would have to anyway produce the same results as the inbuilt one. - This avoids the several indirection steps previously necessary to perform a map projection (qgeotiledmap -> private->mapscene-> private). Since these operation are quite frequent one per map item coordinate at every redraw, shortening the indirection chain is beneficial - It simplifies the highly complex QGeoTiledMapScene, separating all the logic that is not needed to draw the scene, but only to perform geo coordinate <-> screen coordinate conversion Change-Id: I9e3ca5280166f2d6430a32deb44c030d02d9d4e1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Make zoomLevel refer to a default 256^2 tile sizePaolo Angelelli2017-01-163-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the zoomLevel is the power of 2 reflecting how many tiles are in a map edge. This means that two plugins with two different tileSize will show a map of different size at the same zoomLevel. With this patch the zoomLevel is "normalized" upon a tileSize of 256, regardless of the tile size in use. In this way, the new 256 based zoom level can be a consistent parameter also for plugins that are not tile based. CameraCapabilities therefore now offers two new methods, m[in,ax]imumZoomLevelAt256, that return the respective value for the normalized 256^2 tilesize. It also gets a setTileSize, which is currently not used as all our plugins use a tile size of 256 (which is the camera capabilities default tilesize value). Change-Id: Ib12092fd14faf7fc85f8be5fb799dbd5496b760b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Rename QGeoProjection to QWebMercatorPaolo Angelelli2017-01-163-6/+7
| | | | | | | | | | | | | | | | | | | | QGeoProjection is currently a class containing only static methods for WebMercator conversion/interpolation. This patch renames it to QWebMercator, effectively freeing the QGeoProjection name for a real projection class Change-Id: I15b71d04f7d1d21a1d26f46687ed33aa277f6deb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Compile-fix: qAbs is less ambiguous than abs(double)Edward Welbourne2016-12-091-6/+6
| | | | | | | | | | | | | | | | | | Furthermore, since the candidates for abs(), that g++ found, all took integral parameters, they would have involved truncation. Our qAbs() is suitably templated to cope with double naturally. Change-Id: I373a08657ed182c7d853104879b07fb7704cc418 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Deprecate QGeoShape::extendShapePaolo Angelelli2016-12-072-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | As the collection of QGeoShapes grows, this method loses its scope, as it would have undefined behavior for certain shapes (polygon, or polyline, for example). Therefore the base class virtual method is now deprecated, with the documentation pointing to the specific implementations instead. Change-Id: I9717df092b8686b5413556858e9dfe7eaa92dd80 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Refactoring QGeoTiledMapScene::mercatorToItemPositionPaolo Angelelli2016-12-071-76/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch reimplements the method mercatorToItemPosition using values relevant for this type of conversion, instead of re-using values initially computed for the tile generation. This allows to greatly optimize the method, reducing branches and the total number of operations, as well as making it easier to understand. This patch also removes the support for letterboxing the map viewport inside the DeclarativeGeoMap, as there now is the constraint that the map can never be smaller than the containing element. Change-Id: Ida98e97ad0a6b65233c80ae3c4abd3ec7664c555 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'gerrit/5.8' into devAlex Blasche2016-12-051-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/imports/location/qdeclarativegeomap.cpp src/location/maps/maps.pri src/location/maps/qgeomap_p_p.h src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp src/plugins/geoservices/osm/qgeoroutereplyosm.cpp Change-Id: I18d31cff9233648178fe3e2636ce294026dfaeb7
| * Renaming QGeoMapPrivate::changeMapSize to changeViewportSizePaolo Angelelli2016-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current name of this method generate confusion, as what it does is changing the size of the final element in the application, and not the actual map size. This patch renames this method to changeDisplaySize It also renames QGeoMap::setSize to setViewportSize, as well as ::size to viewportSize , width to viewportWidth and height to viewportHeight, to make everything consistent and self-explanatory. Finally it also renames minimumZoomAtMapSize to minimumZoomAtViewportSize. Change-Id: I7c1ca8bb3ca3d6f6b0fe6fc881b9300db7110527 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add Q_LOCATION_PRIVATE_EXPORT to QGeoMapPrivatePaolo Angelelli2016-11-221-1/+1
| | | | | | | | | | | | | | | | This patch privately exports QGeoMapPrivate, effectively making it possible to subclass QGeoMap directly. Change-Id: Ib373eff5ab6782c832464d2df3484d2790ea3644 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | MapParameters for accessing specific features of custom QGeoMapsPaolo Angelelli2016-12-017-9/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a new MapParameter object to give users access to specific features of a custom QGeoMap otherwise not accessible through the standard API. A MapParameter is implemented by a QDeclarativeGeoMapParameter, which, in turns, inherits from QGeoMapParameter in the location module. In this way QGeoMap & subclasses won't depend on declarative, from this side, still allowing a QMapWidget someday. The implementation is based, on both sides, on the dynamic properties of QObjects for defining the MapProperty data. This allows high flexibility in defining various types of MapParameters (essentially by duck typing them), and therefore each plugin which makes use of them must document each of them. Change-Id: I5f3a8c18e996f290beb8e4ff37d3c2c655eefc6c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add support for QGeoPathPaolo Angelelli2016-12-014-1/+395
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds an addition qgeoshapes, QGeoPath. This represents a geographical path where each consecutive geopoints are connected along the shortest line of constant bearing (rhumb line). The path has a width, in meters, that is used in the contains() method to decide whether a coordinate is or not on the path, based on shortest distance to the rhumb line segments. Change-Id: Ia02780e3c8ac6c6d63a6083f53ea0677f8a21a1d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Change QGeoRectangle::translate to not modify the rectanglePaolo Angelelli2016-11-301-4/+4
| | | | | | | | | | | | | | | | | | | | QGeoRectangle::translate currently modifies the rectangle if the latitudinal offset brings the rectangle out of bounds. This patch changes the behavior of the translation, clamping the latitudinal offset, and preventing changes to the rectangle geometry. Change-Id: Iedb8823bbd6e3c04ee499bb9f9945049a9590aae Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add support for boundingGeoRectangle to QGeoShapePaolo Angelelli2016-11-302-1/+62
| | | | | | | | | | | | | | | | | | | | | | | | this patch introduces QGeoShape::boundingGeoRectangle, which returns a QGeoRectangle containing the latitudinal/longitudinal bounds of a geoshape. The bounding geo rectangle is projection independent, as it returns a georectangle containing the min/max latitudes/longitudes of the shape. Change-Id: Ie3a83ec41f87ea3753899d2278e664fe2469f778 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Refactoring: removing m_reply from GeoReply classesPaolo Angelelli2016-11-293-12/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch tries to simplify the code removing the contained m_reply from all the Geo[Map,Route,Geocode,Places]Reply classes. The need for m_reply was associated to the "abort" method, but this can be solved by emitting a signal in the superclass abort() method, and connecting that to QNetworkReply::abort() in the constructor. Since QNetworkReplyHttpImpl always sends an OperationCanceledError it should then be safe to call deleteLater() on the network reply in the slot connected to QNetworkReply::error This patch also prevents the series of "QCoreApplication::postEvent: Unexpected null receiver" warnings that are generated due to deletingLater already deleted objects (abort() emits an error, the reply is destroyed inside the onError slot, but also in the abort() method). Finally, this patch removes the setFinished() call in QGeoRouteReply::abort() since the documentation does not mention this, and all the subclasses do not perform this operation and emit the corresponding signal. tst_qgeoroutereply has been adapted accordingly. Change-Id: I226ee163e7bed784dd7f0da1522e651459543bca Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Merge remote-tracking branch 'gerrit/5.7' into 5.8Alex Blasche2016-11-021-0/+3
|\ | | | | | | | | | | | | Conflicts: tests/auto/declarative_ui/BLACKLIST Change-Id: I0f6c9228c899c4d1d55fffc596c661ee0f6c2b66
| * Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-11-021-0/+5
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/location/qdeclarativegeomap.cpp src/location/maps/maps.pri Change-Id: I346d7351e98f4a1aa67c9c0401d41b6da9099f48
| | * Skip failing autotests due to flick signals not being emittedPaolo Angelelli2016-11-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that the combination of mouseClick/mouseMove/mouseRelease is not able anymore to produce consistent flicking. This makes some autotests fail, however manually using a mouse succeed to make the flickable flick. For this reason this patch skips the failing autotests for the moment until the root cause is found Task-number: QTBUG-56679 Change-Id: If5b24ae50eca5e7f1e4d8f2d38bc7e4183c60903 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-182-0/+8518
|\ \ \ | |/ / | | | | | | Change-Id: I5bcca8956007506362c5a96ff345e28718da584c
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-0/+4118
| |\ \ | | |/ | | | | | | Change-Id: Ie8986d40efc5a241cb94ba743e343cbb35f66611
| | * BC data files for QtLocation for Qt 5.6Milla Pohjanheimo2016-09-141-0/+4118
| | | | | | | | | | | | | | | | | | | | | Added binary compatibility data files for tst_bic test Change-Id: Ia6b466a9d521178abde67720c73a841fbe9a5670 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | BC data files added for QtLocation (5.7)Milla Pohjanheimo2016-09-151-0/+4400
| | | | | | | | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtLocation for Qt 5.7. Change-Id: I254403dcbce854602afd8b4c163bdcd20c47f6b5 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | Add geoservices plugin to support ESRI mapping servicesv5.8.0-alpha1Guillaume Belz2016-08-311-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog] Add geoservices plugin to support ESRI mapping services. Change-Id: I96fdfd9af77dc51166a9ded268bbcf0d66016fda Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | QDeclarativeGeoMap::sendTouchEvent: fix compilationSimon Hausmann2016-08-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit eb238e2cf9013f9a6cd20af0a59180896abdc377 got rid of QQuickWindowPrivate::itemForTouchPointId by keeping track of the grabbers in the event points. Task-number: QTBUG-55229 Change-Id: Icc4bcc987937ee299a47d8aa43147adc53369f47 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'gerrit/5.7' into devAlex Blasche2016-07-293-71/+158
|\ \ \ | |/ / | | | | | | Change-Id: I6a1a72547077c628429ee9a0781070ad3ae787f1
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Michal Klocek2016-07-282-69/+148
| |\ \ | | |/ | | | | | | Change-Id: I37542960aa091ab2074914a2cebb8c5114237a26
| | * Fix the fitViewportToGeoShape calculationMichal Klocek2016-07-281-70/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation is calculating the bounding box of a geocircle based on moving along a circle of latitude by the distance of a circle's radius. Unfortunately the distances on a small circle of a sphere are greater than great circle distances. Reimplement the calculation using tangential points between a geocircle and meridians. Do not center the viewport in the center of the geoshape, use the center of the bounding box instead. Simplify zoom level adjustment calculations, use the reference world plane to get rid of longitude wrapping and rounding erros. Finally update a viewport unit test, adjust the minimum map size to 256x256, so fitToViewport calls have chance to succeed. Fix out of order test execution. Task-number: QTBUG-54337 Change-Id: I61726a4eb7183470c493ceb03d101f3a75305121 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * A fix for not working setVisibleRegionMichal Klocek2016-06-241-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the visibleRegion, than changing the map center or zoom and than setting it again does not work. Fix the issue by invalidating the region on the zoom or center change. Task-number: QTBUG-54141 Change-Id: I4e680f146312e3a3aa90e27fae213042cc2b2a42 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| | * Delay removal/readd of map items until incubation completion on resetPaolo Angelelli2016-06-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the model is reset, QDeclarativeGeoMapItemView currently removes all map items and then begins recreating new delegates for model items. This causes flickering since the mapitems are removed at once, but the repopulation is asynchronous and allows the scene graph to repaint in the meanwhile. This patch delays the removal of current map items until all the new items have been all incubated, so that removal and readd happen at the same point. The patch also adds additional checks to methods like itemModelRowsRemoved, to verify if an item is still incubating. Task-number: QTBUG-52301 Task-number: QTBUG-54188 Change-Id: I2f27114c3898bd61b1282b1f27b5f062bed1fe35 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Fix for wandering QGeoMapPolylineGeometryPaolo Angelelli2016-06-281-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGeoMapPolylineGeometry is currently erratic due to the semi-randomly varying geoLeftBound, that basically defines how the line will be drawn. This patch uses a consistent way to calculate this value in all the QDeclarativeGeo-items, at coordinate-definition time. The new approach implies that each pair of points in a polyline are connected in the longitudinal direction of the shortest path. The patch attempts to optimize the common addCoordinate path by incrementally searching for the left bound. The patch also makes the other geoshapes (GeoPolygon, GeoCircle) behave in the same way. Task-number: QTBUG-43107 Task-number: QTBUG-52610 Change-Id: I7a0f6c4370fd6c50999fd2e5b1a7aa5954c8a8fc Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | | Add routing support for the mapbox geoservice pluginVlad Seryakov2016-07-221-1/+1
|/ / | | | | | | | | | | | | This patch adds routing support for the mapbox plugin Change-Id: Ibaf9d9d8a845b49cb8a6fc0d3530ffe57f4989db Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-101-6/+22
|\ \ | |/ | | | | Change-Id: I36abd2a91a470360c87f23a6d8084f908d93e7e0
| * fix for losing map item focus while dragging themPaolo Angelelli2016-06-021-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeGeoMapItemBase::childMouseEventFilter currently does a contain() check on the clicks but also on the mouse move events. by not doing it on mouse move events the problem seems fixed, but the autotests get broken because it seems that the map doesn't get panned anymore but the element gets dragged instead. Task-number: QTBUG-52075 Change-Id: I5ce340ca591ec924eebed1fe7acda18d31301fc5 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove test_border_drag testMichal Klocek2016-05-301-152/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Since change 820f79284248e5fcc9910282055e67f07c918559 map can not have "borders", remove test which tries to drag items in/out of map borders, moreover particular test tries to drag items which are not visible, which gives anyway false results. Add missing zoomLevel setting to init(). Change-Id: I4932e767fe1b9e3d213ef7b2f654a9bbe857de78 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-05-274-145/+122
|\ \ | |/ | | | | Change-Id: I066dc4f161f4bdfe182ba9fe00d273e5fbcedf5d
| * Replace waitForRendering calls in qml unit testsMichal Klocek2016-05-264-145/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes eea315187d1add70aaf69745c031b8d6342b2303 moved map items final position calculation to "polish" call of sg. In unit testing "waitForRendering" was introduced to sync between input events processing and items being polished. Unfortunately this approach is race condition prone, since render can run in separate thread and frame swapped signals are emitted from render thread. Replace waitForRendering with waitForPolished instead. Improve test execution by providing init() and intTestCase() functions for map items unit tests, so test can be run "out of order" manner. Add missing namespace macros for location test qml plugin. Task-number: QTBUG-31797 Task-number: QTBUG-53455 Change-Id: Iec083143ae621e5be603d03f43d6ef260b056d0f Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge branch '5.6' into 5.7Alex Blasche2016-05-261-1/+1
|\ \ | |/ | | | | Change-Id: If8d408079ba6cceffd516c0ed95a21a2ca1ca2a0
| * QtLocation autotest fixPaolo Angelelli2016-05-201-1/+1
| | | | | | | | | | | | | | Apparently this test passed until now for mysterious reasons Change-Id: I9597c13bc7b3d8fee148d6e1095b7a09ea3b37dc Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-05-182-6/+4
|\ \ | |/ | | | | Change-Id: Ifed3a326085bd4aaff069007966efd6932c2be3b
| * Windows: Skip flaky tests in declarative_ui.Friedemann Kleint2016-05-181-0/+4
| | | | | | | | | | | | | | Task-number: QTBUG-53455 Change-Id: Ib65496de7e59341fe4ed8a443aed10fe4b2a63d4 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * decruft project fileOswald Buddenhagen2016-05-101-6/+0
| | | | | | | | | | | | | | the "created by qt creator" header is not supposed to be checked in. Change-Id: Ib5cc25c57d3d096f818d67169ec98c9f3cb75c47 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Fix for negative QGeoCoordinate.azimuthTo results in range ]360, 359[Paolo Angelelli2016-04-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | QGeoCoordinate.azimuthTo() currently returns negative value (between 0 and -1) for azimuths that should instead be in the range between 360 and 359. This patch should bring all returned values in the range [0, 360[ (360 excluded). Change-Id: I0b5ee7c3fc2bbeb80ca8167a53c7c16d9e067e29 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Reduce setCameraData calls to minimumMichal Klocek2016-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | Remove checks for cameraCapabilities during each setCameraData call. This checks are already performed on plugin initialization. Refactor QGeoMapPrivate to reduce resize calls. Rename updateRequired to sgNodeChanged to reflect real useage. Add setter setSize for QGeoMap. Change-Id: If4e3501fa99a8a97cbc471990837b08c43b8e723 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>