summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-0828-81/+381
| |\ | | | | | | | | | Change-Id: Ib65445a9e316252e7483d2878b8cdad252242177
| * | Add binary compatibility file to QtLocation for 5.12Milla Pohjanheimo2018-12-191-0/+4838
| | | | | | | | | | | | | | | | | | | | | Binary compatibility file added. Change-Id: I46e179f29957a281f0b04424a6d44fb63556b208 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | winrt: Remove incorrect asserts and fix incorrect conditionOliver Wolff2019-01-311-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setPreferredPositioningMethods and setUpdateInterval are called by init so these functions should not assert in initializing state. Additionally the early exit condition in setPreferredPositioningMethods has to be the same as in setUpdateInterval. Both cases have to return early if the locator has not been initialized. This initialization happens in init, so both states, Initializing and Initialized, are fine for further handling. Change-Id: I4ef8db7178c38299328041a8d163a1b9bbecc5b1 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* | | Document Qt.labs.location qml modulePaolo Angelelli2019-01-301-0/+18
| | | | | | | | | | | | | | | | | | Change-Id: I823bd3ebbd74096fc7319147dc7d4ca6ef10e414 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | test app: Improve status and error handling a bitOliver Wolff2019-01-243-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reset "running" check box if an error occurs - Add check box to manually reset position source's error code, as error is not emitted with NoError - There is no need to handle the "OK" case in errorChanged, as the corresponding signal will not be emitted for NoError Change-Id: I53d637c8efd807d6c3e8abff98963585fe74f220 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | winrt: Initialize position source on first usageOliver Wolff2019-01-142-24/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading the plugin without access to the location service will work and not error out. It is still possible to enable location service later and the backend will work as expected. This patch changes the behavior so that the pop up asking for access to the user's location data is no longer shown when the plugin is loaded, but when the backend is actually used for the first time. Change-Id: I23100f7867610c6f23b2d2ea5c15c268468949a9 Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* | | winrt: Depend on access to service for supportedPositioningMethodsOliver Wolff2019-01-141-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The locator's status is only updated while a positioning session is active so it does not always reflect the correct state. By checking the access we have a more reliable way to reflect the current state. Task-number: QTBUG-66427 Change-Id: I75d2274c9efd29bf070913246738bf18a9ec5edc Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* | | winrt: Implement supportedPositioningMethodsChangedOliver Wolff2019-01-141-0/+10
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-66427 Change-Id: I6cccb1d62c116e762e073e996e5932c7351787d9 Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* | | winrt: Initialize status and position tokens' values in constructorOliver Wolff2019-01-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Doing their initialization near the end of init() is too late because parts of init (namely setUpdateInterval and setPreferredPositioningMethods) rely on them. Change-Id: I81ea1db53aa531248f2c49b8f53f2c33b5fb954e Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* | | winrt: Do not emit error signal with NoErrorOliver Wolff2019-01-141-1/+4
| | | | | | | | | | | | | | | Change-Id: Ic90cf82b9c07377875408d0c485aa8af987323c4 Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* | | winrt: Smaller code cleanupsOliver Wolff2019-01-142-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Use override where applicable - Use declaration initialization if possible - Do not use temporary variables which are not used Change-Id: I68311dfc090fa6a217814a7f801fef6764778cab Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Set things up for logging in positioning test applicationOliver Wolff2019-01-141-0/+3
| | | | | | | | | | | | | | | Change-Id: I3f44e1a1d5022c00db149b2ba23d4dd91d3b1f1a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | winrt: Check access to location service on every callOliver Wolff2019-01-141-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The access to location services can change while the application is running so checking the access only once does not work. If access is not granted set the proper error code. Change-Id: I00d82dd166d049363de1dc9b0ca7015bc494baf5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | winrt: Minor changes to loggingOliver Wolff2019-01-141-2/+3
| | | | | | | | | | | | | | | Change-Id: Iaad7abbb668d6d0542c3697dae3544f7d8fe5c5a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | winrt: React on position source status change eventsOliver Wolff2019-01-142-55/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Querying the position source's status is error prone as it is only updated if position tracking is active. Instead we can react on changes for this status and get updated information when it is available. Change-Id: I18d55faf6163568243d2e05d3c63f13e9e45f413 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* | | Fix MapObjectView removing wrong indices on model changesPaolo Angelelli2019-01-142-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No incubation cancellation required when an object is removed: the DM takes care of that. Handle also the case of itemCreated called during synchronous object creation, that fires the callback in the middle of the ->object call. Task-number: QTBUG-71264 Change-Id: I058a101c754f22f4b6fbcbd7f6f7ded36f3c129b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix QGeoRectangle::operator|=Paolo Angelelli2019-01-142-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the case when one QGeoRectangle contains the second, and wraps around. Change-Id: I7110c1864082c502845754fab2dc4e783455a446 Fixes: QTBUG-72935 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | | | | | Change-Id: I10f8bfb719caa9e00e48d7bc1c6021f4a4c95101
* | | Fix use_mapbox_text_instructions typoTasuku Suzuki2019-01-131-1/+1
| | | | | | | | | | | | | | | Change-Id: Ie6e1b7a21818a10b893b161183da2dd447e41ec5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Fix crash when assigning a Component to MapQuickItem.sourceItemPaolo Angelelli2019-01-111-2/+3
| |/ |/| | | | | | | | | | | | | | | This workaround is currently needed until QTBUG-72930 gets fixed in qtdeclarative. Change-Id: Id75fa2048dd6e012c99f61cdc07cfedbe8c6bf83 Fixes: QTBUG-61509 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix MapItemView attempting to instantiate items with map not setPaolo Angelelli2019-01-071-0/+3
| | | | | | | | | | | | | | | | | | | | This case was not a problem when the only incubation mode was Asynchronous, because the test for m_map was done in createdItem. Now that Synchronous is supported too, this check has to be done earlier or else instantiated items will never be added to the map. Change-Id: Ifaa033fb0b64cabe74df395fcb387d162cd02b80 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: Ifc3f75ab0164e3a973e263b68659a7e7dd40d74e
* | winrt: Minor improvements in error handlingOliver Wolff2019-01-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | - If more than 1 action is done inside runOnXamlThread any error should cause a "top level" error. - If every possible error inside runOnXamlThread gives a proper error message we do not need another error message outside of the block. Change-Id: I910f9e4bc7984e1c7e1f358eee975738ffa3bb2f Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Enable testing of QGeoPositionSourceInfo::supportedPositioningMethodsChanged()Alex Blasche2019-01-041-0/+9
| | | | | | | | | | | | | | | | This signal is new and is observable as part of the test application now. Task-number: QTBUG-66427 Change-Id: I3859381f4804112cbf44a365d0c9bb357d068119 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Prevent potential blockage of setPreferredPositioningMethods()Alex Blasche2019-01-041-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful because on several platforms supportedPositioningMethods() returns NoPositioningMethods while the user has disabled the Location service. At the same time the platforms can only support dynamic supportedPositioningMethodsChanged() notifications after startUpdates() was called. Blocking changes to this property would have been counterproductive as startUpdates() would always fail and notification would not be possible. This affects at least WinRT and Android and Apple platforms need still further investigation. Task-number: QTBUG-66427 Change-Id: Ie03a3ef9c9476d7be3547661eaa87678fdb7b39c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Ensure QGeoPositionInfoSource::supportedPositioningMethodsChanged() on AndroidAlex Blasche2019-01-044-3/+23
| | | | | | | | | | | | | | | | | | | | | | This signal was added in Qt 5.12 but never emitted on Android. Due to implementation issues this signal is emitted for each provider change (e.g. twice if network and gps provider were disabled when the entire location service is disabled) Task-number: QTBUG-66427 Change-Id: I820b3187bfd8b8ab4facb053e2019e4f5c9736d0 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Improve QGeoPositionInfoSource::supportedPositioningMethods() docsAlex Blasche2019-01-041-4/+38
| | | | | | | | | | | | | | | | | | | | In particular the differing levels of support on various platforms needed documentation. Task-number: QTBUG-66427 Change-Id: I4c390d14ad69e2f1630e883c8f0a34cbca028a03 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Fix QGeoPositionInfoSource::supportedPositioningMethods() on AndroidAlex Blasche2019-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | So far this method returned all existing positioning methods and not the available methods. Availability is defined by customer settings like turning location off or only enabling GPS based positioning. Task-number: QTBUG-66427 Change-Id: Id5b58ee4cc0274bae90ed2e363cb5cf2a287dc05 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Introduce a map plugin parameter to decide U-Turn directionTasuku Suzuki2018-12-267-15/+70
| | | | | | | | | | | | | | | | | | | | | | When "uturn" comes from OSRM, Qt returns UTurnLeft since Right Hand Traffic is in use in most countries. This commit allows qml to set traffic side to return correct u-turn direction. Task-number: QTBUG-72462 Change-Id: Ifaa002b063159b4e4ee563d007721ba7a4a587a4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Register QGeoCoordinate debug streaming operatorAlex Blasche2018-12-211-2/+7
| | | | | | | | | | | | | | | | | | | | | | This enables the following code: QGeoCoordinate coord(foo, bar); QVariant v; v.setValue(coord) qDebug() << v; Change-Id: I3cc66c359d6be8b8ab9471170ae8763e08c3b3e9 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Enable QVariant::save for QGeoCoordinateAlex Blasche2018-12-211-0/+23
| | | | | | | | | | | | | | | | Fixes: QTBUG-62682 Fixes: QTBUG-68331 Change-Id: Ibd08934e2b6da06a6b6ff24419e53b87fb2eaa20 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Collect vertical position accurancy detailsAlex Blasche2018-12-141-1/+15
| | | | | | | | | | | | | | | | | | Android's platform API supports this piece of information since API version 26. Fixes: QTBUG-64689 Change-Id: I09cce4979f3f754cb9af11281de2fe0050b74da1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Add ability to visually log position updates in test appAlex Blasche2018-12-126-6/+110
| | | | | | | | | | | | | | | | | | | | This makes it much easier to check received positions outside of debug/console output. Regular updates cannot be received inside a building which means a device can be taken out of the office for further testing without the need to have a developer machine attached. Change-Id: I1a54a1b2fa269ec4ab75aacc4531158a02345382 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Ignore Android specific build filesAlex Blasche2018-12-101-0/+3
| | | | | | | | | | | | | | They make it impossible to find any other file. Change-Id: I9abe8ea08befab52c00e1d1e60262c637905fbbc Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix warnings in jnipositioning.cppAlex Blasche2018-12-101-27/+28
| | | | | | | | | | | | | | | | | | Since Android uses a new NDK/compiler since 5.12 there were many more warnings which had serious implications. Examples are potentially flawed downcasts, nullptr warnings and old style casting operators. Change-Id: I53989fa9120c8b7e865d23255d1fcdf229e7f2f3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-105-16/+38
|\ \ | |/ |/| | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifd3514a958d0df4320b253c26e3da3a632088be8
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+32
| |\ | | | | | | | | | Change-Id: I0aed0065d1a7a17821be82594ae4f14dba2b5665
| | * Add changes file for Qt 5.11.3v5.11.35.11.3Alex Blasche2018-11-231-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + ce1767d724e26012cfcd2eae0143ec9a87984046 Use the correct name for the resource when building statically + 8a7bde9b93208259de65d6b1aef21d21b495b6d7 If a category has UnspecifiedVisibility then we should still match + f9a1c4a18a3421617e28d2c26d30b011d22a0229 Amend 8a7bde9b93 to correctly account for the UnspecifiedVisibility case + 6b109d09982e09940dc8e777430a04410d7b6550 Fix crash when calling QGeoPath::length on empty QGeoPath instance + ee700d2eeb4508aa5356ddef11bf11964c5d9283 Mapbox: Only include matching categories in the results + 25c6840ff6585ca9f7ab1c168cdcdd18a68c7885 Bump version Change-Id: Ie25e5020441b8e0b2b2dcb8f2fc56d68681c69a0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Fix compilation with GCC < 5.0Paolo Angelelli2018-11-301-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Apparently unable to resolve QPointers to pointers Change-Id: I04b3b7698ea083f83bc2713530656ca8b3f3ac28 Fixes: QTBUG-69512 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Fix missing geometry update when changing border widthPaolo Angelelli2018-11-192-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | In this case, only border geometry was marked dirty, producing a misplaced polygon. Fixes: QTBUG-70886 Change-Id: Ied39e523a584976871a655e436daf8c2700458b6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Fix unstable rotation gestureTasuku Suzuki2018-11-141-0/+1
| |/ | | | | | | | | | | | | | | | | Order of touch events are not sorted on some platform. When touch point 1 and 2 are swapped, map is rotated 180 degrees in a moment Change-Id: I9c308b805a6ca54519f26a9ff19217de7f947c17 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | Change-Id: I9eb138dde3677e25a6c40681bd2e1f7fa4765d10
| * Mapbox: Only include matching categories in the resultsAndy Shaw2018-11-061-4/+3
| | | | | | | | | | | | | | | | | | If an entry in the results had no categories specified at all then it would end up including this in the results even if a specific category was requested to match against. Change-Id: I506b40b73ec07608bd2b2562d92065376fbb67c9 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix horizontal accuracy comparison for competing position resultsAlex Blasche2018-12-051-1/+1
| | | | | | | | | | | | Fixes: QTBUG-72291 Change-Id: Id2c2ce04e12f1470b08e93ec3512ab39b4054f7d Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix warning in Android position pluginAlex Blasche2018-12-051-1/+1
| | | | | | | | | | | | | | | | qtlocation/src/plugins/position/android/src/qgeopositioninfosource_android.cpp:226: warning: implicit conversion loses integer precision: 'qint64' (aka 'long long') to 'const int' Change-Id: I64df529028aac88f1b6e05c72cfba0a9ed6c9a7f Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-054-3/+55
|\ \ | | | | | | | | | Change-Id: I53b052e12532392192d73da7006b204539cad57c
| * | QGeoPath: revert clear API to clearPathv5.12.0-rc2v5.12.0-rc1v5.12.05.12.0Samuel Gaist2018-11-103-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The original name was correct as clear would need to reset more properties which is was not the goal of this method. Change-Id: Iac43a61e4b8bf57220c88d627b33578612c4ddad Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Add changes file for Qt 5.12.0Paolo Angelelli2018-11-071-0/+52
| | | | | | | | | | | | | | | Change-Id: Ib5609e2fa3d76c7372a0362502288eac6eee282a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Port Nokia geo service plugin to QRegularExpressionSamuel Gaist2018-12-041-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the Nokia geo service plugin code to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: Idc7459351c6f1a1b12ba1528c426fced324039a1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix compilation with gcc 4.8Ville Voutilainen2018-12-033-10/+9
| | | | | | | | | | | | | | | | | | | | | GCC 4.8 doesn't like using QPointer in signal connections. Change-Id: I9504efb259712a65427ef1366ca562882085404e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
View Lorry Controller Status