summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove createTileCacheWithDir from QGeoTiledMappingManagerEngineMichal Klocek2015-10-273-12/+4
| | | | | | | | | Recent change adds setter for TileCache, use new setter in here plugin, remove obsolate create function. Change-Id: I8f5ee726f6c14ea6fa2adf82a4713d5b37c6a78b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Added method to set the map cacheHarald Meyer2015-10-264-17/+25
| | | | | | | | | | | | This update adds a new method "setTileCache" to the QGeoTiledMappingManagerEngine class. The method allows custom map implementations to set their own cache. The update also fixes a compiler warning (ctor variable order) and adds Q_DECL_OVERRIDE checks. Change-Id: I22cfdb218ae5c9af145d688f11aab655f4ed3e4b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Split QGeoTileCache for easier customization of the tile cache.Harald Meyer2015-10-2217-143/+346
| | | | | | | | | | | | | | | The QGeoTileCache is split into two classes: The abstract class QAbstractGeoTileCache offers interfaces for inserting and getting tiles, as well as getting cache status information such as used texture memory. The new class QGeoFileTileCache implements QAbstractGeoTileCache and offers a file based caching implementation (the implementation is the same as before splitting the class). Change-Id: I2eab7491d489ac5b251c1296b67688901f5cc7d7 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-212-2/+2
| | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix each install path with the repository name. Task-number: QTBUG-48736 Change-Id: Ie14b7b15f94e96540d94a7384530faabd8b539f3 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Fix LGPLv3 headersAlex Blasche2015-10-152-41/+32
| | | | | Change-Id: If3656e908659585e3bad871ae92bb67101877392 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Update supported platform list for PositioningLaszlo Agocs2015-10-091-2/+3
| | | | | Change-Id: I89fda2e203ea596dc4975c3b0c87b8e47565489d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add qtserialport-based NMEA position plugin for WindowsLaszlo Agocs2015-10-095-0/+201
| | | | | | | | | | GPS receivers typically come with USB-to-serial drivers for Windows. This allows reading NMEA sentences via Qt Serial Port, thus providing basic GPS positioning support for all desktop Windows versions. Task-number: QTBUG-48082 Change-Id: Ie053dffaaf76bc08b2b6148104fd981b0f1ccc6b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-0861-0/+671
| | | | | Change-Id: Id3ef277b5610a45ffa42850dd9415e963ed45285 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Doc: replaced \target with \keyword at top of pageNico Vertriest2015-10-012-2/+2
| | | | | | | Task-number: QTBUG-48482 Change-Id: I24aa4f3fbca69c4bf6db9da2c785693d230eb5f1 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Purge spurious execute permissions from a text file.Edward Welbourne2015-09-291-0/+0
| | | | | | Change-Id: I5b9b46aafa8e8bf79c7ba54ecab9a4523a3d4476 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Bump all QtLocation 5.5 tags to 5.6Alex Blasche2015-09-2346-46/+46
| | | | | | | | | | | | | | | 5.5 was a tech preview release. The real release is 5.6. Some 5.5 interfaces did change. It is possible that there are apps in existence which are based on the 5.5 API's. To avoid miscommunication we bump all version tags to the real first release version. The existing 5.5 QML imports will continue to work but apps may encounter API changes when they move from 5.5 to 5.6. The API changes are listed in the QtLocation documentation. Change-Id: Ia7000e871a5ee6b09234e5d58d4fc8927e93b154 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Remove TP marker from official documentationAlex Blasche2015-09-231-3/+0
| | | | | | | Starting with Qt 5.6 the API commit is given. Change-Id: I795cc7385a8216646bd972e08635f025260be4de Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Check if GenericCacheLocation is writable before trusting itLaszlo Agocs2015-09-221-0/+17
| | | | | | | | | | | | | Enforced application isolation (AppArmor) may make it impossible to write to $HOME/.cache as applications are only allowed to use their own specific directories (as returned by CacheLocation). QtCore is not able to recognize this so the value returned for GenericCacheLocation is still non-empty in this case. Therefore do a write check. Task-number: QTBUG-41187 Change-Id: I6ad136abc69997d25715dcdbbc1b8ffb55ec65e0 Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Do not crash in new gesture areas when getting a wheel eventLaszlo Agocs2015-09-171-1/+6
| | | | | | | | | | | Newly constructed gesture areas lacked a null check for m_map. Thus sending a wheel event results in a crash. This is visible with the mapviewer example when attempting to change the provider but failing due to not having the necessary keys specified. Change-Id: I5983de284f528d4a682b5b239e807e0748bcd740 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Isolate the default cache directoryLaszlo Agocs2015-09-156-15/+38
| | | | | | | | | | | | | Instead of having it in several random places, have a central function that contains all the cache directory selection logic. As per QtCore docs GenericCacheLocation can be empty so introduce a fallback to CacheLocation (the app-specific, non-shared location) in case some future platform does not support the former. Task-number: QTBUG-41187 Change-Id: Icfe5e8926e917483ac11844f625244318ff815c7 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Enable positioning for OS XLaszlo Agocs2015-09-103-1/+6
| | | | | | | | | | Core Location works just fine. Add also a helpful hint to the "unknown" error that comes when Wi-Fi is turned off. Change-Id: I0240f1e070217e19aff4c9329d680dd9991b74b1 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Use categorized logging for Geoclue plugin.Aaron McCarthy2015-09-104-29/+47
| | | | | Change-Id: I9e04a6e8ea75fc1c2ebb3cdd7de4e02e98461613 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove dependency on libgeoclue.Aaron McCarthy2015-09-1021-550/+800
| | | | | | | | | | | | | | | | Re-implement Geoclue plugin using only Qt DBus dropping both the build-time and run-time dependency on libgeoclue. Allowing the Geoclue plugin to be build on all platforms that support Qt DBus. The priority of the Geoclue plugin has been lowered slightly so that the native position plugin, if available, has precedence. [ChangeLog][QtPositioning][Position] The Geoclue plugin has been re-implemented using Qt DBus. Task-number: QTBUG-40702 Change-Id: Ia06d089bfb46c10769ccffd765c044c361a9b484 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Skip loading real plugins in testsLaszlo Agocs2015-09-0910-8/+28
| | | | | | | | | | Introduce a new plugin metadata field "Testable" that can be used to indicate that using the plugin in question in test runs (e.g. in a CI environment) is dangerous. We can then check for QT_QTESTLIB_RUNNING and skip the plugin in question. Change-Id: Iabe9f1600d7274e0e9224dc49d02aa2e5d3cabd6 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Make use of incubator to asynchronously instantiate delegatesAaron McCarthy2015-09-095-33/+188
| | | | | | | | This has the side effect that map items instantiated by the view are no longer be added to the map in a deterministic order. Change-Id: I5933136e8d9dbf0e698353370b9bfc0affe146ac Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix disfunctional disk cache with OSMLaszlo Agocs2015-09-073-5/+12
| | | | | | | | | | | | | | | | | | | | | The MapQuest servers use JPEG, not PNG. The disk cache, unlike the memory one, passed in the extension as the format to loadFromData(). This failed for JPEG files with an extension of .png. In addition, using split('.')[1] to determine the file extension is bogus. On Linux for example, a directory of "$HOME/.cache/QtLocation/..." results in putting "cache/..." into format which is then conveniently ignored by QImageReader. On OS X however there is no dot, so it "correctly" picks "png" for the JPEG data, hence the console is flooded with warnings about failed tile loading. On top of the above, the disk cache is made more robust by not relying on the format string. As long as only formats supported by QImageReader are in use, it can recognize the correct format from the data. (the memory cache does this already anyway) Change-Id: I90ece5bd157d457afa0025527c84070427a60313 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Use a shared dynamic meta object for model dataAaron McCarthy2015-09-072-10/+31
| | | | | Change-Id: Ibc3100064a356399ba9898aac84570eaab609a0b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update map item view items when the model data changesAaron McCarthy2015-09-072-51/+135
| | | | | Change-Id: Ib92252d18c2229bc6d43e11362b8f13cdb48f315 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove leftover half-sentence in Map docsLaszlo Agocs2015-09-031-2/+1
| | | | | Change-Id: I23e1151c300254a1f297c61e4be344b7fd88cc95 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove incorrect string construction in QML debug outputAaron McCarthy2015-09-024-25/+10
| | | | | | | | | | The original string had a "%1" expecting to be replaced by the arg() function, which was not used. Removed the output altogether, silently do nothing if the coordinate is not in the path. Remove dead code trusting that QList::lastIndexOf() will returned -1 or a valid index. Change-Id: Iffa7e663a439696cff6a6aa73d714f1259f4ea69 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update Error enums for GeoCode & Route model typesAlex Blasche2015-08-287-58/+78
| | | | | | | | | | | 1.) Remove not required/duplicated enums 2.) Add docs for new enum values 3.) Sorted the enums by alphabet (except for NoErrror) 4.) Other minor spelling corrections 5.) Update and expand tests Change-Id: I83bf9e5e40f1237ead45320d020b315b39442946 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Alex Blasche2015-08-2813-16/+28
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-1913-16/+28
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/imports/location/qquickgeomapgesturearea.cpp Change-Id: If115a052678b140eee46b8c0d9471b7d96953915
| | * Fix issue where tiles are prefetched using both prefetch stylesAaron McCarthy2015-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before being made run-time selectable the only a single prefetch style was used. Restore the same behavior by adding a break to the switch statement. Change-Id: Id16a4b11709497df1511b2605c0a9b5837590b3a Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
| | * Make geoclue plugin compile on gcc4.5Alex Blasche2015-07-241-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ic95affaf6952877b567b55a5ce6c385acd405736 Task-number: QTBUG-47427 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * OSM supports up to zoom level 19Alex Blasche2015-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I803716afdd7ca9c2693c6236f5e741174d58a3f6 Task-number: QTBUG-47322 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Harald Meyer <dev@meh.at> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| | * Add missing url parameter for OSM places search.Alex Blasche2015-07-163-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a few minor grammar/spelling issues in related documentation too. Change-Id: I21c153596b02931c66a38f7068173c687cbe0ad9 Task-number: QTBUG-47188 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| | * Fix OSM parametersAlex Blasche2015-07-152-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation states the plugin uses "osm" as parameter name prefix. These cases where forgotten when this naming convention was introduced. Change-Id: I7a3735e04db7b55b8b3d4d6bf84002d63dbcfea9 Task-number: QTBUG-47188 Reviewed-by: Harald Meyer <dev@meh.at> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| | * Update places-list and places-map examplesMichal Klocek2015-07-134-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change position used in examples to Oslo. Update marker icons to be the same as in mapviewer example. Update screenshots, so they contain osm map. Add marker icon to places_list, so it does not look so boring. Add places title to places_map, so it is more readable. Change-Id: Ia321aa8577e77f76468c504cd4e6ce877712089c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| | * Remove FIXME which is no longer relevantAaron McCarthy2015-06-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Gesture handling on rotated maps works as expected. Change-Id: I36dee2f3b933aa9c361694fc74f86868a882fc5d Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Fix remaining QtLocation qdoc warningsAlex Blasche2015-08-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /home/bb/dev/qt/qt56/qtlocation/src/imports/location/qquickgeomapgesturearea.cpp:145: warning: C++ class QDeclarativeGeoMapGestureArea not found: \instantiates QDeclarativeGeoMapGestureArea /home/bb/dev/qt/qt56/qtlocation/src/location/places/qplaceeditorial.cpp:99: warning: Cannot find 'QPlaceEditorial(...)' in '\fn' QPlaceEditorial::QPlaceEditorial(const QPlaceContent &other) [I cannot find any function of that name with the specified signature. Make sure that the signature is identical to the declaration, including 'const' qualifiers.] Change-Id: I10c2326364c8e8d29ddf641f42267302b05b9379 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | | Update qmltypes file for QtLocation 5.6Alex Blasche2015-08-251-60/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | The MapGestureArea changed its implementation class but otherwise remained unchanged from an API perspective. Change-Id: Ia37e572dcdbea2765a1e9881981132be98770c20 Reviewed-by: Harald Meyer <dev@meh.at> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | Update QML types file for QtPositioning 5.6Alex Blasche2015-08-251-10/+19
|/ / | | | | | | | | | | | | | | | | The class implementing the animation has changed but the API offering is the same. Change-Id: I950fea89dc67b60123727d4848488f7fc24374cd Reviewed-by: Harald Meyer <dev@meh.at> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Always update polyline node when a new scene graph node is createdAaron McCarthy2015-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | In some situations the item is not marked as dirty when a new node is created. This fixes an issue where the route/polyline is not drawn until the map is interacted with. Change-Id: Ib89646cb804f925fedc668f845ac33cf916a7721 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Do not rely on synthesized MouseReleseEvent when tracking mouse pointMichal Klocek2015-07-132-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A map pan is based on synthesized events due to the fact that rest of qt (qtcontrols , mouse area etc) depend on it in case of touch handling. However when there are two touch points on the screen pinch handling is activated. After accepting the touch event, mouse synthesized events are no longer generated for the first touch point, what's more as a result we might not get even mouseUngrabEvent nor mouseReleaseEvent. This breaks internal tracking of mouse position. This workaround resets mouse tracking point in case of getting touchUngrabEvent. Remove dummy extra MouseArea from places example. TODO: fix broken mouse area state in pinch unit tests Task-number: QTBUG-46388 Change-Id: I5588fbd4dbf0c5d25c44f994292c1aae7b3d70d4 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Make QQuickGeoMapGestureArea a QQuickItemMichal Klocek2015-07-135-96/+90
| | | | | | | | | | Change-Id: Ifa732d0d1d1396dc8a8c4663e72741a0d3f7d4a6 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Rename files qdeclarativegeomapgesturearea to qquickgeomapgestureareaMichal Klocek2015-07-134-5/+5
| | | | | | | | | | | | | | | | This change is a part of qdeclarativegeomapgesturearea becoming a qquickitem Change-Id: If997ff3839c4b0a84344ac3db83b1266bcef52e2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Change to use m_ naming convention in QDeclarativeGeoMapGestureAreaMichal Klocek2015-07-132-298/+299
| | | | | | | | | | Change-Id: Ibd90ff25c672565fe23836dc316b04d9f0caf42b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Improved zooming and map movement behavior.Harald Meyer2015-07-133-10/+28
| | | | | | | | | | | | | | | | | | | | | | Improved: Double tapping/mouse wheel based zooming keeps the map at the current geo location. Added: Left/Right/Up/Down keys can be used to move the map. Task-number: QTBUG-47020 Task-number: QTBUG-47019 Change-Id: I63859319b282e7738a173b0d3917433860fc8969 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Cache coordToMercator result during coordinate animationsMichal Klocek2015-07-036-24/+124
| | | | | | | | | | | | | | | | | | | | A calculation of Mercator transformations is expensive. Cache calculated values in QGeoMercatorCoordinatePrivate. Caching is only enabled for QGeoCoordinateAnimation. Default coordinate interpolation does not use caching. Change-Id: I5fe67e6a3da6e4b01c0e0ad33d1f45a152660937 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove unused function from qdeclarativegeomapMichal Klocek2015-07-032-11/+0
| | | | | | | | | | Change-Id: Ib287999cdd734875ebbb6cd775b694389a32b069 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix map flick bounces back on zoomlevel 2Michal Klocek2015-06-301-2/+19
| | | | | | | | | | | | | | | | | | | | | | Use different type of the coordinate's interpolator when flicking west and east to prevent longitude bounce effect. Add checks for valid latitude before starting a flick animation to prevent latitude bounce effect. Task-number: QTBUG-44311 Change-Id: I1f4d81f299759b130f4e08ccf8b2baa7e5105459 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix map flick animation in qdeclarativegeomapgestureareaMichal Klocek2015-06-308-47/+45
| | | | | | | | | | | | | | | | | | | | | | | | Current implementation is using QPropertyAnimation for flick, which was suitable for old QML1. Use QQuickCoordinateAnimation instead. This change is necessary to control what type of coordinate interpolation is used for flicks. It reverts 58d8b5e84ac6952b411cff3bca7336073349290e. Task-number: QTBUG-46147 Change-Id: I0a3bf263147b3733c617d38c364f66173b806de5 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-2/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iae1f27979ba8fbb28d8bdf737d63904e75c1f4d1
| * Make use of qBoundAaron McCarthy2015-06-261-2/+1
| | | | | | | | | | Change-Id: Ia6859fa30118f29d6074d4ffed9e22023f75cc3b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
View Lorry Controller Status