summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update plugins.qmltypesv5.4.05.4.0Kai Koehne2014-12-042-2/+4
| | | | | Change-Id: I5e3ff34d8724fab19408f42984308ca12b4ff521 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add changelog for Qt 5.4.0 releasev5.4.0-rc1Alex Blasche2014-11-171-0/+54
| | | | | | Change-Id: I4828f4d3d66dd4f6739388d10e91395ed951f3b5 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add missing include for QObjectSamuli Piippo2014-11-031-0/+2
| | | | | | | Missing include caused build failure with simulator enabled. Change-Id: I8f3aafab5353ec23de87fa4b02f10429ad091ace Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
* Android: A new positioninfosource is always initialized with NoErrorAlex Blasche2014-10-241-1/+1
| | | | | | | Task-number: QTBUG-41873 Change-Id: Ic6efadbdf92a2d43151089509708556e48748120 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* iOS 8 - CLLocationManager authorizationTimur Pocheptsov2014-10-232-0/+18
| | | | | | | | | | | | | iOS8 introduced a new authorization scheme for Location data. Before retrieving location data, CLLocationManager must request authorization. Call two methods: requestAlwaysAuthorization/requestWhenInUseAuthorization on a location manager (which one will work/preferred - can be adjusted by setting NSLocationAlwaysUsageDescription/NSLocationWhenInUseUsageDescription entries in a plist). Task-number: QTBUG-41827 Change-Id: I9fc24921dc7d889b629b2c71e7698a33fc6ae47a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Ensure that rounding errors are considered by QGeoCircle::containsAlex Blasche2014-10-221-1/+6
| | | | | | Task-number: QTBUG-41447 Change-Id: I9837fab4b7132f406f69ecbe6c0e5f383345a516 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix QGeoCoordinate::toString() when rounding long/lat corner casesAlex Blasche2014-10-132-0/+63
| | | | | | Change-Id: I14da28acbd124e07da42fbf5efc3a501267f86f3 Task-number: QTBUG-41739 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Applied title case to section1 titlesv5.4.0-beta1Nico Vertriest2014-10-098-8/+8
| | | | | | Change-Id: I7ad07daac92e1af8c7daa4f59b948692c03a85e3 Task-number: QTBUG-41250 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Updated the request URL to use https instead of httpVenu2014-09-262-3/+4
| | | | | | | | | | | | | | The request to search the photos on flickr needs SSL, without which the search fails to get the required results. Also updated the example's GridDelegate to scale the photos based on pixelDensity. Otherwise the photos look too small on high DPI devices. Task-number: QTBUG-37203 Change-Id: I5f3385e99868bdfae6e62d1ade5acea2ac536b65 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix non-standard \since tag in QGeoAreaMonitorInfoAlex Blasche2014-09-261-1/+1
| | | | | Change-Id: I9d4a6c7341a8ea468d7ecfc5c55b36ee434d66e4 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix fitViewportToMapItemsRefine when the map solely contains quickitemsJürgen Hunold2014-09-251-4/+9
| | | | | Change-Id: I0152af80f1c1165a78310db2b263221036830448 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix DeclarativePlace unit testAlex Blasche2014-09-231-2/+6
| | | | | | | | This broke due to a behavior change in QtDeclarative when converting JS Array to C++. For more details see QTBUG-40431. Change-Id: Id666b4872a5cd1e435cca67b5362c2ab3beb3633 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Put pre-defined GPS log file into qrc fileAlex Blasche2014-09-173-5/+9
| | | | | | | | This fixes shadow build breaks and not found log file on OSX when using app bundles. Change-Id: Ib92cb2973c4687b356f8f35d4dbce2c39ef70b17 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Doc: replace VisualDataModel with DelegateModelNico Vertriest2014-09-162-5/+5
| | | | | | Task-number: QTBUG-37725 Change-Id: Ia5b98f630afd735d60e80eb986d5df7a9d40cd82 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Merge remote-tracking branch 'gerrit/5.3' into 5.4Alex Blasche2014-09-083-10/+75
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib269ecd9a61ebe25da23a0423682b591f7c399c3
| * weatherinfo: improve update behavior of weatherinfo example5.3Fawzi Mohamed2014-09-033-10/+75
| | | | | | | | | | | | | | | | Ensure that new data will get processed, and that error can be recovered, while avoiding an excessive load on the server. Change-Id: I1c3a0b17eb0cc31553013e953d7dcf46060daef1 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Bump versionFrederik Gladhorn2014-08-291-1/+1
| | | | | | | | Change-Id: I9ba0ee3a88beaf14a0e6627aa3dff377b57619ae
* | 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.25.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
|\ \