summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Re-enable declarative_ui testsv5.4.0-alpha1Alex Blasche2014-09-042-1/+0
| | | | | | | | | | Disable pinch/flick test for now as it doesn't pass. Nevertheless we want to enable the other tests to maintain quality. Task-number: QTBUG-31797 Change-Id: I1b73079fc102cc9a1ee649122daf950522722b09 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-281-4/+8
|\ | | | | | | Change-Id: I92b8aba7f6f63acfa2de21a1b4451a108f622344
| * OSX: Fix QGeoPositionInfo attribute values with corelocation plug-inv5.3.2Alex Blasche2014-08-151-4/+8
| | | | | | | | | | | | | | | | | | | | | | Fix corelocation plugin to return "nan" values for the QGeoPositionInfo attributes which aren't available. Task-number: QTBUG-38300 Change-Id: Id4c6eb69ef65fccfd7de32ec476d3afa3c4bbf98 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Update license headers and add new license filesAntti Kokko2014-08-24584-11649/+6800
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Iedee2507ab1bd46788409a98505d7be510253110 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Merge branch '5.3' into 5.4Alex Blasche2014-08-147-11/+96
|\| | | | | | | Change-Id: I02ab19530354f656823e59bb43a6fc4786b2f189
| * Don't hang weatherinfo if position source has an error.Alex Blasche2014-08-142-1/+19
| | | | | | | | | | | | | | | | We continue with the simulation mode. Task-number: QTBUG-40702 Change-Id: I130b0080a198a218803986fb7ff06fdd0b83186a Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * Enforce the use of test.source position plug-in in auto testsAlex Blasche2014-08-142-2/+1
| | | | | | | | | | | | | | | | | | | | This avoids that platform specific plug-ins such as the geoclue plug-in on Linux interfere with auto tests. The auto tests require the specific test plug-in values to succeed. Task-number: QTBUG-40702 Change-Id: I1c3ea9f6d23e1ad20815a86ded7815e498016af2 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * Report error when failing to connect to Geoclue.Aaron McCarthy2014-08-132-8/+26
| | | | | | | | | | | | | | | | | | [ChangeLog][QtPositioning][QGeoPositionInfoSource] Report errors when failing to connect to Geoclue. Task-number: QTBUG-40425 Change-Id: If3fa0929b724aa70a1fed01b5951f5bc9bd5adad Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Add changelog for QtPositioning 5.3.2 release.Alex Blasche2014-08-131-0/+50
| | | | | | | | | | Change-Id: If443639a44cc22e3e81571033aaee9e4cf188a7b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix revision and docs for new MapType::night propertyAlex Blasche2014-08-144-6/+9
| | | | | | | | | | | | | | | | This property was recently added but not properly advertised as Qt 5.4+ API element and the QML revision was not set. Change-Id: Iab6a125269d627d5e1b3a0e457f6a42708ea7026 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Add magneticVariation and magneticVariationValid property to QML PositionAlex Blasche2014-08-144-22/+66
| | | | | | | | | | | | | | | | | | [ChangeLog][QtPositioning][Position] Added magneticVariation and magneticVariationValid property to the QML Position type Task-number: QTBUG-39547 Change-Id: I59d0039f2b501701f67404dabef2ab4c62bcb16b Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn2014-08-122-23/+20
|\ \
| * | Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-122-23/+20
| |\| | | | | | | | | | Change-Id: I48f866a8fbb8af18dee640eada24556d097059b0
| | * Fix fitViewportToMapItemsRefineWolfgang Bremer2014-08-111-21/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The item counter was broken. Therefore the bounding box calculation only worked under certain circumstances. This commit removes the circle special case calculation, which is superfluous, and treats all map items the same way. Change-Id: Ida0a6cf695fb151132bc867eb30ecb834a5bf6c5 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Avoid potential double deletion when handling OSM route repliesAlex Blasche2014-08-111-0/+3
| | | | | | | | | | | | | | | Change-Id: I15ab944e7b9e7cecc8ff9122183c438fd006e65b Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| | * Fix QGeoRouteReplyOsm::networkReplyFinishedWolfgang Bremer2014-08-111-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can happen that the osm router does not find a route between the specified points. In this case it returns a json object with a status code other than 0 and an error message. This commit notifies the app developer that an error occurred and that no valid route is available. Prior this it was not possible to catch the error message. Change-Id: I172ae3cf9dfcd80e5a162110178203084071c9b0 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Make QtLocation compile with pre-compiled headersAlex Blasche2014-08-122-24/+23
|/ / | | | | | | | | | | | | | | | | | | | | | | | | For some mystical reason Polygon is redefined by an unknown Windows header preventing this file from compiling if Qt is compiled with pre-compiled headers. The workaround is to simply rename this private type. Discussed-in: http://lists.qt-project.org/pipermail/development/2014-May/017125.html Task-number: QTBUG-39692 Change-Id: If71e1a12394dfde7729d0505417a37b9fd407c82 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-293-53/+47
|\| | | | | | | Change-Id: I8768dd3f81a7f53020771f60332b1ed144b4ed07
| * Fix issues with MapItemView.Aaron McCarthy2014-07-152-50/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MapItemView did not allow clearing either the model or the delegate. There is no reason to restrict clearing these properties. Doing so makes it difficult to temporarily hide the view setting a null model. Signal connections between the model and the view were never disconnected, which could result in strange behavior if a single view is used to display multiple models. Removed unneeded member variables and declared but unimplemented member functions. Change-Id: Ife4745ab38104460960c18419ed1b95e72ffab23 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Fixed symbol clash between sensor and positioning plug-in on iOSAlex Blasche2014-07-141-3/+3
| | | | | | | | | | | | | | | | | | | | locationDelegate is used by two iOS plug-ins at the same time. This removes the duplicate names and thus fixes the build if the same application happens to use the two APIs. Task-number: QTBUG-40198 Change-Id: I7bb0c1400f1a088a70854b522ca81ee58f1abbb0 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Remove unused source file.Aaron McCarthy2014-07-232-246/+0
| | | | | | | | | | Change-Id: I198835abd66cab93ed687c75909aabd3a921e621 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Doc: Changed section numbers in QML basic type pages.Jerome Pasion2014-07-214-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | changed section2 to section1 changed section3 to section2 ...it looks better to have a section1 because the CSS makes them look more prominent. Change-Id: I2e8e336dd38199adcffee1f91a16bc2fae885cfe Task-number: QTBUG-40335 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Add mobile optimized pedestrian maps to Nokia/HERE plugin.Aaron McCarthy2014-07-211-5/+9
| | | | | | | | | | | | | | | | | | The description of the existing pedestrian maps falsely indicated that they were mobile optimized. The mobile wording has been removed and actually mobile optimized maps have been added. Change-Id: I48f7ea043cfbe424508fc783adabef47f283d2e9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Add night property to MapType.Aaron McCarthy2014-07-219-125/+152
| | | | | | | | | | | | | | | | Similar to the mobile property this property allows applications to determine if the tile set is optimized for night time use. Change-Id: Ibaaffe6f745d90817b5938f493742fb019be0312 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Register all QtLocation QML types for version 5.4Alex Blasche2014-07-092-4/+6
| | | | | | | | | | Change-Id: Idd345621b8f3069dc53008dfa99b33f1006cd5ce Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-072-2/+0
| | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I44a5496055123030a65464f808505d6d18b3f164 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Use qreal for equalOrNaN(), exclusiveNaN() helpers in QML import plugin.Friedemann Kleint2014-07-071-12/+2
| | | | | | | | | | | | | | | | | | Fix g++-warnings: qdeclarativeposition.cpp:95:6: warning: 'bool {anonymous}::equalOrNaN(float, float)' defined but not used qdeclarativeposition.cpp:105:6: warning: 'bool {anonymous}::exclusiveNaN(float,float)' defined but not used Change-Id: I430864ebbf31592fd1a1cfc5e2f52af7cedc708e Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Compile fix for platforms without process supportMaurice Kalinowski2014-07-071-1/+4
| | | | | | | | | | Change-Id: Iaf15ecd49524a787198d091399454c3daeeeb51b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Compile fix without proxy supportMaurice Kalinowski2014-07-031-0/+4
| | | | | | | | | | Change-Id: I85e732ad7ea0051a7fdb97224215c19d9c6f7eed Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-2612-13/+14
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifc66b48e407d27f0dd8bb2a38f509bb507f89337
| * Fix the names of the plugin factory classes for static plugin loadingAlex Blasche2014-06-2512-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This breaks positioning on IOS and any other statically build Qt versions. At the same time rename the positionpoll factory class to a more appropriate name to avoid confusion. [ChangeLog][QtPositioning] [iOS] Fixed link error of positioncl and positionpoll plug-in. Task-number: QTBUG-39843 Change-Id: Ic3d5687571cd9e7a531f9958675b895cf22ac13e Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| * Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: I01fba9edd3b4e1cfb7c7547b65da00c71e488844
* | Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/devSergio Ahumada2014-06-1718-53/+1387
|\ \
| * | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-1418-53/+1387
| |\| | | | | | | | | | Change-Id: I79173a906d9af146e3707f8cacc60892609f590c
| | * Fix wrong qreal architecture checksv5.3.1Dmitry Shachnev2014-06-123-42/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Qt 5.2, qreal is double on all architectures by default, but some vendors (like Jolla) still use qreal = float. Instead of old (and broken) architecture checks, use runtime check sizeof(qreal) == sizeof(double). Remove the compile-time checks between DBL_MIN/DBL_MAX checks, these are sufficient on their own. Change-Id: Iae0c6486afaed0f0653fb3338c048c8f22d1e587 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
| | * Add changelog for upcoming Qt 5.3.1 releaseAlex Blasche2014-06-031-0/+57
| | | | | | | | | | | | | | | | | | | | | Change-Id: I0f709d1066763d2c17950da8b092ecf5f28d9556 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| | * Fix crash on S4 when running Satellite and Position updates concurrentlyAlex Blasche2014-05-232-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused due to unsynchronized access of data between two threads. The Java satellite updates were sent before the receiving Qt thread could finish its regular startup. As a consequence the received updates could not be mapped to a receiving C++ class. This patch synchronizes the startup and setup of the two threads and ensures that the relvant data setup on the C++ side is done before the update thread is started. In addition some minor debug helpers were added for future references. Task-number: QTBUG-39082 Change-Id: I1f24ddfcef038fa000801ddb6a3ea0959370f0d3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Add snippet app to verify plugin implementationMaurice Kalinowski2014-05-235-0/+617
| | | | | | | | | | | | | | | | | | | | | Useful when creating a new backend to verify behavior. Change-Id: I7a417aabad4d6dbbe494dcd384ca7af57bd78050 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Implement WinRT plugin for positioningMaurice Kalinowski2014-05-237-0/+657
| | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtPositioning][QGeoPositionInfoSource] WinRT backend added. Change-Id: I00e7725a082aa485c3ab5afcaebd20344b48e07d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Disable headers precompilationSergio Ahumada2014-06-171-0/+1
|/ / | | | | | | | | | | | | | | | | Workaround to make location compile while the actual issue is investigated. Task-number: QTBUG-39692 Change-Id: I0320181594b0b87ed037827dc8cf3608ba5c776e Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-05-226-18/+20
|\| | | | | | | | | | | | | Conflicts: tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp Change-Id: I2bf1657c6dd3b73e654e7db8bdadadfb293e2180
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-144-2/+4
| |\ | | | | | | | | | Change-Id: I05aa3988ce01f01bf987e259dcac0144e52cdf89
| | * Add missing classname entry for positioning and location qml module.v5.3.0-rc1v5.3.0Alex Blasche2014-05-054-2/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-38770 Change-Id: Id4577bd23858880b6f406f9d82a8e5195c4e3d8c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * | QNX: Fix compilation of testsSergio Ahumada2014-05-062-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | - replace ceil() -> std::ceil() - replace floor() -> std::floor() - replace pow() -> std::pow() Change-Id: I102ec6748fceef02fadce1bc3e5bb37e7ebdcd9d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Use QStringLiteral whereever possibleAlex Blasche2014-05-1548-449/+444
| | | | | | | | | | | | | | | | | | | | | This replaces a lot of old QLatin1String cases Change-Id: I47aec711f5e00de68bde6c2c8ee09506f577cfd4 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | | Merge branch 'stable' into devAlex Blasche2014-05-0526-55/+174
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/src.pro Change-Id: Ibc0a58c565aec37fb09b96e27309f50892340cac
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-014-7/+4
| |\| | | | | | | | | | Change-Id: I923d8eaed437dc461f98b1ed88585cc9cde528d9
| | * Remove unnecessary private export macroAlex Blasche2014-04-244-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | This was discovered during a header review of Qt 5.3. Change-Id: Id852deb6fb5eadb43e643ac25e3b52dad7f7dd59 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * | Build snippet outside of example build configurations too.Alex Blasche2014-04-241-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial revert of 9cbddccc24cdd4b51285ea9ecbf851f3eba2cd31. The CI does not test a combined developer-build and example configuration. Ensuring the snippet compiles is mostly a private test. This patch drops the additional example condition to provide an increased chance of compiling the snippets on the CI. So far the condition never triggered and hence the CI couldn't ensure a compiling snippet. Task-number: QTBUG-37638 Change-Id: I8e64bb2b53b0452c5168faeb37f2809e96ac6e77 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Alex Blasche2014-04-236-10/+91
| |\ \ | | | | | | | | | | | | refs/staging/stable
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 04:11:24 +0000