summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge remote-tracking branch 'origin/5.4.2' into 5.45.4Liang Qi2015-05-181-0/+28
| |\ | | | | | | | | | Change-Id: I3f38216477c400a576571791aa253ea6e16d776e
| | * Add QtLocation changelog for Qt 5.4.2 releasev5.4.2Alex Blasche2015-04-241-0/+28
| | | | | | | | | | | | | | | | | | Change-Id: I1ecd0c44f3cc425e7455a8cc786e59fe98fe84c9 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | Reanimate tests/auto/qmlinterface.Friedemann Kleint2015-05-235-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CONFIG += testcase to tst_qmlinterface.cpp. Use QVERIFY2 to show QML load errors. Fix failures. Before this change, the test was not executed at all because "make check" was an empty target due to missing CONFIG += testcase. Change-Id: I6aa839fdbbbee6bdf316cbb5050fe5a5b53c12cd Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Enable and update map flick and pinch autotest.Michal Klocek2015-05-224-72/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make pan drag distance inclusive in QDeclarativeGeoMapGestureArea which simplifies unit testing on different platforms. Use sceneCenter instead of lastPos for panning startup. lastPos is used with velocity sampling which makes it not reliable as a starting value. Change-Id: If0d98e834a5e2d4264a51d70c2c39846cd2a677b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | More fixes to geoshape.type qml documentationAlex Blasche2015-05-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add \since information. We cannot use \since directly as geoshape is not documentated by proper class doc style. - Add section heading. Change-Id: I0ea15617439454627a34ced78168cdb212beab5f Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Fix missing guarded pointers for mapping engineMichal Klocek2015-05-2113-125/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since mapping engine is going to be destroyed on geoseriveprovider change/plugin unload use QPointer to track engine existence before making calls. This commit refactors a bit QGeoTileRequestManager to handle all the calls to the enigne. Check for null pointer before calling the engine. Move registerMap method to base class. Update QGeoTiledMapNokia class accordingly. Change-Id: I886e85e660b2c515e4a617e98e9cc0c3c13781b6 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Unify zoom calculationsMichal Klocek2015-05-212-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | Make camera calculations in qgeocameratiles and qgeomapscene more obvious. Use the same fractions. Change-Id: I4f156bb894eb2c606df97308ebd1b637408d9f2d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Fix missing tiles on some zoomLevelsMichal Klocek2015-05-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ratio between screen size and tile size was high, frustum far clipping plane was preventing intersection points calculations. Do not use magic value for far clipping plane, since frustum is not used in projection for int zoom level changes, simplify near clipping plane. Near clipping plane should be always smaller than possible altitude value. Far plane should always exceed altitude to allow intersections with z plane. Task-number: QTBUG-45508 Change-Id: I59693ace794de37f0ad3544c11eb0c5a471eeb04 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Refactor fetching calls in QGeoCameraTilesMichal Klocek2015-05-216-96/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce dirty flags, remove redundant getters. Change fetch ifdefs to switch case, so all code gets compiled. Change-Id: I610f20098c67089bd2c2684910283f165e1109e0 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Add QML API changes to documentationMichal Klocek2015-05-212-0/+53
| | | | | | | | | | | | | | | Change-Id: I597130a7cca150ab9f1afbd542efa7270f337019 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Rename cameraStopped to prefetchData in Map APIMichal Klocek2015-05-212-3/+3
| | | | | | | | | | | | | | | Change-Id: Ia875214b7233e05a7f430931a2ba7437c9a428e3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Ensure that docs always import QtPositioning and QtLocation moduleAlex Blasche2015-05-2018-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the same time we update the import versions and reduce the qdoc tag duplications. Change-Id: I894d163657734a4b3bbc2951462660571f340dfd Task-number: QTBUG-46147 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Fix crash when initiating map flick w/o QtPositioning importAlex Blasche2015-05-206-19/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A map flick requires a QPropertyAnimation for a QGeoCoordinate. The required animation interpolator is exported by the QtPositioning QML plugin. In general a QML Location app should always import QtPositioning as well. In this case the import was missing and subsequently the interpolator for the QGeoCoordinate was never registered. This patch ensures that the QtLocation QML code that requires the animation registers the interpolator in addition to the regular QtPositioning registration. Change-Id: I61759418f0cdf1cb30ff946cc325a112e90c1a2f Task-number: QTBUG-46147 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Updated WinRT license headers to use LGPLv3 instead of LGPLv21Jani Heikkinen2015-05-204-40/+52
| | | | | | | | | | | | | | | | | | | | | | | | From 5.5.0 -> WinRT port is licensed with LGPLv3, see http://blog.qt.io/blog/2015/04/29/windows-10-support-in-qt/ Change-Id: I267f2c70cd7f365464bc596ac5dcb8503219cdbd Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | | Update design in mapviewer exampleMichal Klocek2015-05-1217-47/+36
| | | | | | | | | | | | | | | | | | | | | | | | Update marker and change colors. Change-Id: Ia12ed0145367c5a086ec6b6828db602b4666403e Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Make geoclue plugin compile on RHEL 6.6Alex Blasche2015-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | G_VALUE_INIT was added by glib 2.30 and RHEL 6.6 uses 2.28. We expand the macro to fix the compile issue. Change-Id: I25d19858ad3035a266d9ddf4d9badc830071e943 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Fix QDeclarativeSearchResultModel error processing.Michal Klocek2015-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | When QPlaceReply has an error do not process the reply futher. Change-Id: I373f1f2a25601516bf1cd022283ef1c5b06f8497 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Allow custom URLs for OSRM routingWolfgang Bremer2015-05-083-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the usage of another routing server than the default osrm project. The api still needs to be the same, but it is possible to drive your own server using the OSRM project sources. Change-Id: Ib335fdf97eb1e208caafb17783c22d9b423a40e2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Allow custom URLs for OSM tilesWolfgang Bremer2015-05-088-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the usage of various mapping services which use the OSM API for tile distribution. One only needs to set the urlprefix parameter to a correct url and the activeMapType to the "Custom URL Map". Task-number: QTBUG-32937 Change-Id: Ib24da19dc598ccc288047ce2651e6c1792ae2054 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | | Shift generic docs away from planespotter exampleAlex Blasche2015-05-077-39/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | They are more general and are linked to from other pages too. Change-Id: I828008e3692a593bf9343346508b9c0ad8183108 Task-number: QTBUG-45415 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | | Provide new planespotter exampleAlex Blasche2015-05-0710-1/+731
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This diversifies the location examples as it adds a relatively small example. Short of the places examples there is only one large demo-like mapviewer example. This new example demonstrates the following features: - integration of C++ types into QML - coordinate animations - fitting viewport of maps Change-Id: Id0b5b9669cfd1d98bb5dce7d7d42d220efd60142 Task-number: QTBUG-45415 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* | | Clean up QGeoCameraTilesMichal Klocek2015-05-052-120/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit: * renames class members to use m_ naming convention * changes private pointer to be QScopedPointer Change-Id: I036db1c859a88b4cd205e233f5547a80af49ef75 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Remove movementStopped from QDeclarativeGeoMapGestureAreaMichal Klocek2015-05-055-9/+12
| | | | | | | | | | | | | | | Change-Id: I8d8265dd51838bc61c3ea86c487cf5e6ff60a475 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Change visibility of updateSceneGraph in QGeoMapMichal Klocek2015-05-051-3/+3
| | | | | | | | | | | | | | | Change-Id: Ief580b2091c59b98b046d8c02271212b97493bdb Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Fixes PIMPL in QGeoTiledMap.Michal Klocek2015-05-057-89/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes following changes: * QGeoTiledMapPrivate is now a subclass of QGeoMapPrivate. * makes QGeoMap constructor private. * change visibility of setCameraData in QGeoMap, so that only QGeoMapController can modify the camera data. * moves mapResized,changeCameraData,changeActiveMapType to private implementation interface. * moves mapVersion member function to base class. Change-Id: I336e7f72b03e845e09e445a6eebad90b2e46dbd1 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Cleanup QGeoTileMap code.Michal Klocek2015-05-055-103/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit: * renames class members to use m_ naming convention * removes not required includes * removes not required forward declarations * adds Q_DECL_OVERRIDE * removes prefetchTiles() call Change-Id: I3f41cce7fcb0050adb8a5ad90304419b81476955 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Merge remote-tracking branch 'gerrit/5.4' into 5.5Alex Blasche2015-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic7cb934900f2abb78bf11730118d8737e555d1f1
| * | Bump versionOswald Buddenhagen2015-04-201-1/+1
| |/ | | | | | | Change-Id: Ie692152bafa378bd9f01bf673966a7ffcd150ee7
* | Set shorter name for class names with 'MapData'Michal Klocek2015-05-0434-165/+165
| | | | | | | | | | | | | | | | Rename all references and files with 'MapData' to use shorter name 'Map'. Change-Id: I8ab790146ee28e540e6866ba0218eea61bae6e64 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix PIMPL in QGeoMap.Michal Klocek2015-05-043-101/+39
| | | | | | | | | | | | | | | | Use QObjectPrivate as base for QGeoMapPrivate. Remove not required setters and getters in private class. Change-Id: I029a77907235b4b0976ad961f1c41b5038da3881 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove QGeoMapData class.Michal Klocek2015-05-0422-460/+212
| | | | | | | | | | | | | | | | | | Since QGeoMap class does not have any subclasses, there is no need for keeping the bridge in form of QGeoMapData. This commit basically renames QGeoMapData to be QGeoMap. Change-Id: I6eb2f56f7ea83663034f4a8297e8e8f7f185d6a9 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Cleanup QGeoMapData code.Michal Klocek2015-05-043-98/+56
| | | | | | | | | | | | | | | | | | | | This commit: * renames class members to use m_ naming convention * removes not required includes * removes not required forward declarations Change-Id: Ia4f0f71f2f27c4b3978581bc4f55703cb6e0273f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Cleanup QGeoMap code.v5.5.0-beta1Michal Klocek2015-04-302-58/+29
| | | | | | | | | | | | | | | | | | | | This commit: * renames class members to use m_ naming convention * removes not required includes * removes not required forward declarations Change-Id: If1132ecf0413022ecfe4e781cb412bf8f8d6740e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove QLOC_TRACE macrosMichal Klocek2015-04-292-17/+1
| | | | | | | | | | Change-Id: I580d066f2e83425eb471180fa323e77f6e21ed59 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Cleanup QDeclarativeGeoMap code.Michal Klocek2015-04-294-284/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit: * renames class members to use m_ naming convention * removes not required includes * removes not required forward declarations * adds Q_DECL_OVERRIDE * changes visibility of member functions * removes not used members: touchTimer_,zoomLevel_, bearing_, tillt_ Change-Id: Ice6f6a54ea3ca8be75a2427c93e872b697916463 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix user interactions in mapviewer example.Michal Klocek2015-04-291-13/+16
| | | | | | | | | | Change-Id: I73fb797f2b96198459214ea88f3b708fda53e543 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Unify the doc pages of all QtLocation examplesAlex Blasche2015-04-235-28/+39
| | | | | | | | | | | | | | | | | | - Add the "Running the Example" section - Reorder existing information as a consequence of the new section - Reduce duplicated qdoc content Change-Id: I1df91a385ce17394da4f2debb4171ade63ce3fcc Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Remove duplicate code from QDeclarativeRouteMapItemWolfgang Bremer2015-04-204-148/+27
| | | | | | | | | | | | | | | | | | The QDeclarativeRouteMapItem was more or less a copy of the QDeclarativePolylineMapItem. Now, the RouteMapItem directly inherits from the PolylineMapItem and adds only the route interface. Change-Id: I73e0dddf09ea893b1340c7606cda50de7dc573f1 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix incomplete category hierarchy in Here pluginAlex Blasche2015-04-172-3/+11
| | | | | | | | | | | | | | | | | | The recent addition of a second level of categories failed to set the parent cat id for each child. Change-Id: Ib30050463b84c2f62972082c0a883bb96bc89c52 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | QtPositioning supports WinRTAlex Blasche2015-04-161-2/+3
| | | | | | | | | | | | | | Make this obvious on module's index page. Change-Id: I5542d948bac6f92e4e0271435eabc226e5570efa Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | Fix broken doc links after recent mapviewer integrationAlex Blasche2015-04-151-4/+4
| | | | | | | | | | | | Change-Id: Ia74e7fb6bd5321af7d5f92e3e04c9ff0c5027f73 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix missing doc link in positioning qml docsAlex Blasche2015-04-151-1/+1
| | | | | | | | | | | | Change-Id: Ibc0f5366f9e297ef1f2fd878a107ceb5d3633d0b Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Update QtLocation qmltypesAlex Blasche2015-04-142-4/+3
| | | | | | | | | | | | | | | | | | | | At the same time document a small API addition which was highlighted while the qmltypes were updated Change-Id: I935b18330e4d5a9d81ccbf3223387603b076a3dd Reviewed-by: Wolfgang Bremer <wolfgang.bremer@pelagicore.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove obsolete calls to map.state in mapviewer exampleMichal Klocek2015-04-142-22/+3
| | | | | | | | | | Change-Id: I6fe478f1e7fd3c243c1da9623eac0a80f693e1a8 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove not used marker hover functionality from mapviewer.Michal Klocek2015-04-143-2/+1
| | | | | | | | | | Change-Id: I83511201db05298899dd1f9202cbe3c26b6b19ea Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Refactor code and fix documentation for mapviewer example.Michal Klocek2015-04-148-223/+205
| | | | | | | | | | | | | | | | | | Refactor code so the MapComponent holds the most of revelant code for documenting. Rewrite mapviewer example documentation so it fits the current code snippets. Change-Id: Idf468d2025303a42cea6ca8d24ed541c509911c0 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Change slider orientation in mapviewer example.Michal Klocek2015-04-141-49/+43
| | | | | | | | | | | | | | | | Set zoom slider to be vertical and move map scale information to right bottom corner. Now it is easier to read map copyrights and scale. Change-Id: I5d76fabe2e7b3fc08a4274a3efb25435ebd1dc0d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Clean up files in mapviewer example.Michal Klocek2015-04-1432-86/+90
| | | | | | | | | | | | | | | | | | | | | | Rename files, move the subdirectories, remove obsolete dependencies to location examples plugin. Conflicts: examples/location/mapviewer/mapviewer.pro Change-Id: Id85dfffc32761eb9d2999b8e07b87f9912700659 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Reformat mapviewer example code.Michal Klocek2015-04-1313-635/+672
| | | | | | | | | | | | | | | | | | Make code to follow qml coding conventions. Use switch instead of if-else statement. Add helper.js with common functions. Change-Id: Iba989d3677fa428b45609f24a82b26ef7cefe675 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove map's background in mapviewer example.Michal Klocek2015-04-132-40/+1
| | | | | | | | | | Change-Id: I4010e9081d5718e18a05df6933a1297421ffccd7 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 12:40:58 +0000