summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-0171-0/+71
| | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: Ie0f96417cf765796e5288769563df7845086546a Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Move qlocationtestutils.* to a more appropriate locationabcd2012-08-0124-34/+34
| | | | | | | | | qlocationtestutils is no longer specifically dedicated for qgeocoordinate therefore move it into a common utils directory. Change-Id: I3f25d0e1f0524323813f78b0bcf18112d5755ef5 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fixes for QPlaceResult + unit testsabcd2012-07-315-11/+423
| | | | | | | | | | | | | | | -Comparing QPlaceResult objects resulted in a crash due to a comparison function incorrectly calling itself recursively. -Copying a QPlaceResult object did not copy the data fields from QPlaceSearchResult This patch fixes the above issues and also has a comprehensive set of unit tests for QPlaceResult. Task-number: QTBUG-26611 Change-Id: I9b6dcc90e5f061d2e268051c682291adf1b04c7b Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiates.Jerome Pasion2012-07-3040-45/+90
| | | | | | | | -\qmlclass command is now \qmltype -\instantiates is for QML types that have C++ implementation. Change-Id: I8ff5ab355f5e0499c747ed2e63511452f08c4ad3 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Let mapscene manage its own light for the map tilesIan Chen2012-07-301-0/+8
| | | | | | | | | This prevents unintended deltetion of the glpainter's main light when a 3d item is removed from the map Task-number: QTBUG-26552 Change-Id: I0b4dff86ca5310684927c30fdfeca6842237a160 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Add workaround for managing map item's coordinatesIan Chen2012-07-306-2/+47
| | | | | | | | | can be removed once coordinates are passed by value, see QTBUG-25636 Task-number: QTBUG-26550 Change-Id: Ibd862cb87550bf8f2b31a7a14750e4b676d5c0e6 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix behavior of the cancel operationabcd2012-07-275-21/+58
| | | | | | | | | | | | | | | Previously calling cancel would always set the state to the Null state. Instead calling cancel should transition to the Ready state. Also in the PlaceSearchModel tests, ensure each test function has a pristine model by dynamically creating the PlaceSearchModel, rather than using the same one declared in QML. Task-number: QTBUG-26583 Change-Id: I43e4caab5e58700a8725cf52b8ff22364995b03b Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix compiler warning.Aaron McCarthy2012-07-261-0/+1
| | | | | Change-Id: I3123ee648df9f133477cb15a671cfab7426be414 Reviewed-by: abcd <amos.choy@nokia.com>
* QtLocation: Fix compilation.Friedemann Kleint2012-07-262-178/+25
| | | | | | | | | | | Adapt to change qtdeclarative: 7daab8039abc32ab5be5706a08cb58905fe0e0b6, (Remove QListModelInterface). QQuickListModel is now a QAbstractItemModel, remove the QListModelInterface functions. Change-Id: Ic71ffa4bcdb0162c0ecc70f7c51a87428f5e9dde Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Ian Chen <ian.1.chen@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* updating places system testsNatalia Shubina2012-07-252-42/+7
| | | | | Change-Id: Ia7c97db02769c7354c7bcc27893fb85db06dff60 Reviewed-by: Daron Andrew Edie <daron.edie@nokia.com>
* Update MiniMap to use new gesture apiIan Chen2012-07-252-9/+7
| | | | | | | | | Update doc on the use of gesture area Task-number: QTBUG-26554 Change-Id: I8b3374a76455ec2f72f91017d3c1e13b63d6e9e2 Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix a case where map item wrapping failsIan Chen2012-07-253-2/+3
| | | | | | Task-number: QTBUG-26076 Change-Id: I9c565cf971dfcc9d9407bfd68d6e5c624584f700 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Update doc to reflect changes to mouse eventsIan Chen2012-07-252-4/+4
| | | | | Change-Id: I0a531293a9fe6da244297f211c2a4311ffac6536 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* compareObj params to follow convention of (actual, expected) resultsabcd2012-07-241-8/+8
| | | | | | | As opposed to (expected, actual) results. Change-Id: I040e85d9362a5c296ac8d3afba99dc9f39d1b6b2 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Expand unit tests for EditorialModelabcd2012-07-243-1/+169
| | | | | Change-Id: I4c62370193ae9c3ade7094fd4cd8e9841d627205 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Expand unit tests for image modelabcd2012-07-243-5/+190
| | | | | Change-Id: I1039b63a2d0dfb487515697eec5b54565f1e4882 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Assorted fixes for jsondb pluginabcd2012-07-231-5/+7
| | | | | | | | | | | | | | | -when a geoshape was supplied, no search results were returned -the title and icon fields of QPlaceSearchResult weren't filled in -the plugin erronously did sorting after it set the results, when it should've done sorting before -categories for results were not set due to assignment to a copy rather than to a reference This change is one of the first steps of re-enabling the jsondb unit test to prevent further regressions. Change-Id: I1ff3d7e32b46341ab506bf0804556a5e880ff925 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Refactoring to use tryCompare() instead of wait()abcd2012-07-231-11/+5
| | | | | | | | As well as being more elegant, this patch should help avoid test failures currently seen on the mac platform. Change-Id: Ic9457a44722ad84843fb7f0d63f718607a2463ea Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix incorrect warning messages + refactor error handlingabcd2012-07-2013-70/+68
| | | | | | | | | | | | | | | | | There was an assumption in the QML models that if the QGeoServiceProvider::placeManager() returned null, then places was not supported. This is no longer the case as incorrect parmeters may result in null being returned. Previously a warning was output to console. Instead, if possible, we set the error status of the model, and set the error string to the one provided by the QGeoServiceProvider. If it is not possible, such as in the case of the Icon element, a warning is output to console but only if it is deemed necessary. Task-number: QTBUG-26566 Change-Id: I584222af9325ddb8575fa8f77909521c49bc850a Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Test that the package configs for QtLocation work.Stephen Kelly2012-07-205-1/+91
| | | | | Change-Id: I01ce8e5d239faf9d50fc4165ad59d07fd63a63a5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* updating routing and mapitems system testsNatalia Shubina2012-07-202-3/+9
| | | | | Change-Id: I18ec40d61b283c0897a81d84e0a8d3cd7ca61cc0 Reviewed-by: Daron Andrew Edie <daron.edie@nokia.com>
* Fix inconsistent enumsabcd2012-07-206-95/+40
| | | | | | | The CategoryModel enums did not match the those from the search models. Change-Id: I9088910812d3624c0260b0a9482470537fd4df3a Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* More fixes to map circles across north/south polesIan Chen2012-07-204-72/+284
| | | | | | | | | | | | | | | | - Add a work-around for drawing circles at poles - Add circle geometry that handles a special case when fill area needs to be inverted for a huge circle that crosses both poles - Fix a case where poly2tri triangulation fails for concave polygons (affects polygons and circles at poles) - Change calculation of circle points to be consistent with GeoCoordinate's great-circle distance method Task-number: QTBUG-26373 Change-Id: Ic911aa1f7eeb2e20b8f71eb8ea7361919ca4dfb0 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Produce warning if connection to jsondb could not be madeabcd2012-07-192-0/+10
| | | | | | Task-number: QTBUG-26505 Change-Id: I908ccf8fe5fd95e3c78ff8ac7cce335ed8dbf358 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Document the usage of plugin parameters more explicitly.abcd2012-07-193-16/+33
| | | | | | | | This is especially important when writing about the nokia plugin since it requires an app id and token. Change-Id: I202a4df05d1d42cf6d3ca10da516b5d9e829c83f Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Remove workaround for old unsupported compiler.Aaron McCarthy2012-07-195-37/+9
| | | | | Change-Id: I8e882d9db6af8b8a53fce633428ba4a3e8f8a605 Reviewed-by: abcd <amos.choy@nokia.com>
* QPlaceResultPrivate::compare(): Call the right compare function.Friedemann Kleint2012-07-181-1/+1
| | | | | | | Fix infinite recursion. Change-Id: Ideeea55ab586806b29bfa388d1335db9759d7ddd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Rename QQuickCanvas to QQuickWindow, in line with qtdeclarativeIan Chen2012-07-184-18/+18
| | | | | | | similarly, "canvas" -> "window" Change-Id: I71745fad36f3dcb100d0eaf7bba0806465a761ee Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Rename nokia_places_jsondb to places_jsondbabcd2012-07-1736-29/+29
| | | | | Change-Id: Id3d5a0dd04d399ccb5252c3820f76102144f2802 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Add missing virtuals to private classesabcd2012-07-172-2/+2
| | | | | | | Task-number: QTBUG-26535 Change-Id: I65a2faa924f9c85bf11a8a77e8fc85ab158bfa12 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Inter-module documentation link fixes.Aaron McCarthy2012-07-165-12/+15
| | | | | | | | | | | Set the depends variable in qtlocation.qdocconf to read index files from qtcore, qtnetwork, qtqml and qtquick so that links to documentation in those modules are correctly generated. Fix up remaining broken links even with the above. Change-Id: Ided2b04423088a05c5f2bdf148972e15148dc80a Reviewed-by: Alex <alex.blasche@nokia.com>
* Remove deprecated MapPinchArea and MapFlickable elements.Aaron McCarthy2012-07-1610-772/+4
| | | | | | | They are replaced by the MapGestureArea element. Change-Id: Ib58fa00e81eea728e6d28e91faee99ef6d22b43a Reviewed-by: Alex <alex.blasche@nokia.com>
* Remove support for old compat qdoc commands.Aaron McCarthy2012-07-167-40/+8
| | | | | | | | | | | | The \i command is not used in any Qt Location documentation and the presence of the above macro definitions generates spurious qdoc warnings. Fix the last few remaining uses of these compat commands and remove the compat.qdocconf file. Change-Id: Icb1c9aa131cf93e19f32db5359c26c1338b26dfd Reviewed-by: Alex <alex.blasche@nokia.com>
* Remove unnecessary log messagesabcd2012-07-163-3/+0
| | | | | | | Task-number: QTBUG-26529 Change-Id: Ia8ab7cab820b0f41ec8ed9e02d51707c7a18541e Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
* Add semi-automated test for nokia plugin.abcd2012-07-135-2/+779
| | | | | | | | | | Note that in order to run the test, a valid app id and token must be set as NOKIA_APP_ID and NOKIA_TOKEN environment variables Change-Id: I4b18fee14db2eb23a2728224f3b501a018d22d3d Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Enable copy of mapviewer's media file to build dirIan Chen2012-07-121-0/+11
| | | | | | Change-Id: I6e19e9fc77fd844b7cb597d62728bf41775a52d6 Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Use enabled property in Menu to receive mouse eventsIan Chen2012-07-121-0/+1
| | | | | Change-Id: Ibea44442d9fb6ff56c2724186f32d90923a9f392 Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
* Declare metatype for relevancy hintabcd2012-07-121-0/+2
| | | | | Change-Id: I2bf960884ff13e03cdbd41992c81010bf44f3d42 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Add utility function to help test fetching contentabcd2012-07-122-0/+35
| | | | | Change-Id: I71d80e96c3d5b34d7549c96830fa58ae63d0edaf Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* provide check for invalid coordinate parameters for nokia pluginabcd2012-07-121-19/+37
| | | | | Change-Id: I725af80fdd47d3d0bb50c6c2f02058bec7736b75 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Expand unit tests for review modelabcd2012-07-124-5/+350
| | | | | Change-Id: I7915d8056828bc81e8c31c8e3c281cdf215f42a0 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix emission of totalConentCountChangedabcd2012-07-122-32/+19
| | | | | | | | | | totalContentCount changed would not be emitted when an null place was assigned to the model. It has been fixed along with some refactoring Change-Id: I3ceeec49b5ce3edb340af0260a272c555b8b4059 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix recommendations search in exampleabcd2012-07-122-0/+5
| | | | | | | | | | | | | | | The recommendations search did not work because a search area was being passed along with a recommenation id. Modify the example to only pass a recommendation id by itself. The PlaceSearchModel had to be updated as well so that whenever a null searchArea was assigned, the search request would send a default QGeoShape as a search area, as opposed to not being updated at all. Change-Id: Ia55b2d74e7ac770412fb35e295ee07178cfaeb46 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix emission of signalsabcd2012-07-126-13/+20
| | | | | | | | | | | | Previously, the PlaceSearchModel would emit a countChanged signal on clearing the old results to make way for the new ones during an update. i.e. an emission for count = 0 was made. This changes fixes it so that this "extra" signal is not emitted during an update. Change-Id: I159a1a09deef13b8420d20869859b4e58e94d1ed Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* use centralized qml plugin project handlingOswald Buddenhagen2012-07-114-84/+4
| | | | | Change-Id: Ibe9b056e783f78d2cb2622a174619e4cf36372af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* use centralized handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-111-25/+4
| | | | | Change-Id: Ib689191802632e2f1ab3968c48d4a1fb72f18d5c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Only build mapviewer example when Qt Multimedia is available.Aaron McCarthy2012-07-112-4/+4
| | | | | | | | | | | | The VideoItem element, which demonstrates how to use a MapQuickItem, uses elements from Qt Multimedia. Adds qtmultimedia to sync.profile. Task-number: QTBUG-26468 Change-Id: Ie0b0027d68588e04dbf0d0e0a6f4f86c6229e6e8 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
* Use enabled property for intercepting mouse eventsIan Chen2012-07-092-0/+2
| | | | | | | | | Cannot rely on opacity anymore since items with 0 opacity now also gets mouse events. Task-number: QTBUG-26443 Change-Id: Ia0ad221a73df48d04f9edd30f5a05fe49e4d6b01 Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
* Fix VideoItem's checking of playback stateIan Chen2012-07-091-1/+1
| | | | | Change-Id: Ied6d7831fe7e00f87976a02af3b2a311abadf6be Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
* Change private include file to follow qtgui header rename.ybot2012-07-091-1/+1
| | | | | | Change-Id: I62aa75863c5b2456483ac132d084e3034bcaa1da Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
View Lorry Controller Status