summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* removed Landmark API tests, updated in accordance with the Style Guidewip/qashubinba2011-08-181-479/+259
| | | | | | | | Change-Id: If0bee3ef1f780c867aab224a1d088d8981532dde Reviewed-on: http://codereview.qt.nokia.com/3121 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daron Andrew Edie Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
* modified location system tests in accordance with new Style Guideshubinba2011-08-161-590/+1035
| | | | | | Change-Id: I0d55036557159f1efff0c06585b634b8c804509e Reviewed-on: http://codereview.qt.nokia.com/2981 Reviewed-by: Daron Andrew Edie
* renamed systemtests to system and removed sys_location.pro fileshubina2011-08-112-11/+0
| | | | | | | Change-Id: I5af3ef38836fb28ed0d594d8bb0e84c7b97a0c7c Reviewed-on: http://codereview.qt.nokia.com/2839 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Damian Jansen
* qml_mapviewer: removed Search dialogshubina2011-08-112-34/+4
| | | | | | | Change-Id: I5deb1fc0fa5fc458da0392a681c2784efc0bd2e2 Reviewed-on: http://codereview.qt.nokia.com/2830 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
* route options in mapviewer, new system testsNatalia Shubina2011-08-0310-51/+324
| | | | | | | Change-Id: I0e12aae59346d3e908f4348fc1fd54492e85c360 Reviewed-on: http://codereview.qt.nokia.com/2536 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
* qml_mapviewer: route info, new icons, scaleNatalia Shubina2011-08-0211-129/+440
| | | | | | | Change-Id: I011dc0cec7592a281b4673bcc16b5aa1c3784236 Reviewed-on: http://codereview.qt.nokia.com/2235 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
* Share QGeoServiceProvider within QML.Aaron McCarthy2011-07-298-80/+92
| | | | | | | | | | | | | | | | | QGeoServiceProvider is designed to provide cached instances of manager objects, allowing a single manager to be used for the entire application. This feature was not being used for QML applications as all of the declarative elements were creating a new QGeoServiceProvider based on the data provided in the Plugin element. This happened even if the same Plugin element was used. This commit adds a QGeoServiceProvider member to the Plugin element which should be shared by all users of the Plugin element. Change-Id: Ife62d52178a69ed4a700542f14dae861d7eab4e4 Reviewed-on: http://codereview.qt.nokia.com/2374 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* qml_mapviewer: markers are MapObjects nowNatalia Shubina2011-07-2012-60/+38
| | | | | | | Change-Id: I3cb89274c5b124c20c9a880433dc23c475e3ac93 Reviewed-on: http://codereview.qt.nokia.com/1852 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* fix buildOswald Buddenhagen2011-07-193-5/+1
| | | | | | | | QT_BUILD_TREE is a no-no Change-Id: Icbf3bb5d0776d5db1859c2a2d8d89621c6cc34bd Reviewed-on: http://codereview.qt.nokia.com/1834 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Compile proj library as a static lib.Aaron McCarthy2011-07-193-150/+162
| | | | | | | | | | | | Compiling the proj library as a static lib and then linking as necessary improves compile speed as we now only build it once. The proj library is also built with CONFIG+=warn_off which removes a lot of compile warnings from the build output. Change-Id: I1842263d5bd96f8c89d91b25583ce58c79e2b1ff Reviewed-on: http://codereview.qt.nokia.com/1800 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Laing <david.laing@nokia.com>
* Remove unused variables.Aaron McCarthy2011-07-195-9/+2
| | | | | | | Change-Id: Iaa19026ac9d41eb9ff93b79a67a1b6375381c587 Reviewed-on: http://codereview.qt.nokia.com/1804 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Laing <david.laing@nokia.com>
* Add unused enumerations to switch statement.Aaron McCarthy2011-07-191-0/+8
| | | | | | | Change-Id: I9f5a4fee72ce74415a6ad1d2ae00d1396e91f8b6 Reviewed-on: http://codereview.qt.nokia.com/1803 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Laing <david.laing@nokia.com>
* Add missing Q_INTERFACES.Aaron McCarthy2011-07-191-0/+3
| | | | | | | Change-Id: I1ba33bfcadcc56b956daca97aa1c46088a3a6060 Reviewed-on: http://codereview.qt.nokia.com/1802 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Laing <david.laing@nokia.com>
* Don't use deprecated QString constructors.Aaron McCarthy2011-07-191-3/+5
| | | | | | | Change-Id: I4777a15f4ee10034d52c5efa3e29c8cdc4da0749 Reviewed-on: http://codereview.qt.nokia.com/1801 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Laing <david.laing@nokia.com>
* Fixed build breakAaron McCarthy2011-07-1411-11/+11
| | | | | | | | | QDeclarativeItem was moved from QtDeclarative to QtQuick1 Change-Id: I4bdeaa63386874881f40856553842405c028fbb2 Reviewed-on: http://codereview.qt.nokia.com/1561 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Merge demos and examples.Casper van Donderen2011-07-1130-24/+15
| | | | | | | | | | | We are merging the Qt demos and examples. That means that references to QT_INSTALL_DEMOS should be removed and that the things previously called demos should now be in the examples folder. Change-Id: I5245611428bdd28c884b3f620be96fd970fdbfd0 Reviewed-on: http://codereview.qt.nokia.com/1276 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* fix type in debug outputalex2011-07-111-1/+1
| | | | | | | | | pointed out by Daniel Qiu in Qt-Mobility merge request #34 Change-Id: Ic4ce343f6d27a9211090d0ce2d39c4dcc978da08 Reviewed-on: http://codereview.qt.nokia.com/1389 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
* Fix mouse event reception for map objects within a group.Aaron McCarthy2011-07-083-5/+42
| | | | | | | | | | | Child objects of a MapGroup were not receiving mouse events because they were not being added to the object map. Recursively add and remove child objects to the object map. Change-Id: Ief486674b7dcf034f422711f81f6a3e52c3d1d43 Reviewed-on: http://codereview.qt.nokia.com/1261 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Laing <david.laing@nokia.com>
* Fix crash in when reseting model for MapObjectView.Aaron McCarthy2011-07-081-0/+3
| | | | | | | | | | | QGeoMapObjectEngine maintains multiple lists of QGeoMapObject pointers. When an item is removed from the model not all of these references are removed. Causing invalid memory access at the next paint event. Change-Id: Ia14daf64ba05386472ed14bac7d8de2f11658c0a Reviewed-on: http://codereview.qt.nokia.com/1260 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Laing <david.laing@nokia.com>
* Update sync.profile dependencies to new syntaxAlan Alpert2011-07-081-10/+9
| | | | | | | | | | %dependencies now has a simpler format of gitmodule => %gitref instead of using qt modules and keywords. Change-Id: I785f30e24e0a793218e2e307bdde56067760c51a Reviewed-on: http://codereview.qt.nokia.com/1279 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* adding post code in system tests and qml_mapviewerNatalia Shubina2011-07-082-22/+34
| | | | | | | Change-Id: I9c9c72e5a7c3e26243d469fdaac649dfa2aa0f7d Reviewed-on: http://codereview.qt.nokia.com/1256 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
* Update licenseheader text in source files for qtlocation Qt moduleJyri Tahtela2011-07-0875-1276/+1276
| | | | | | | | Replace old license header with correct one. Change-Id: I9a433f015dd3ab66ad3f1adc9c04a3ffcbc285b2 Reviewed-on: http://codereview.qt.nokia.com/1317 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-stagingQt Continuous Integration System2011-07-051-124/+165
|\ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging: MOBILITY-2975: make text more readable
| * MOBILITY-2975: make text more readableNatalia Shubina2011-07-051-124/+165
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-stagingQt Continuous Integration System2011-07-043-56/+272
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging: MOBILITY-2975: system tests update, MOBILITY-2891: minor fix for messages
| * MOBILITY-2975: system tests update, MOBILITY-2891: minor fix for messagesNatalia Shubina2011-07-043-56/+272
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-stagingQt Continuous Integration System2011-07-014-74/+71
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging: MOBILITY-2891: fixes for routing, geocoding and markers
| * MOBILITY-2891: fixes for routing, geocoding and markersNatalia Shubina2011-07-014-74/+71
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-stagingQt Continuous Integration System2011-06-301-6/+7
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging: MOBILITY-2975: updated of geocode tests
| * MOBILITY-2975: updated of geocode testsNatalia Shubina2011-06-301-6/+7
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-stagingQt Continuous Integration System2011-06-309-97/+427
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging: MOBILITY-2891: markers
| * MOBILITY-2891: markersNatalia Shubina2011-06-309-97/+427
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-stagingQt Continuous Integration System2011-06-28390-1718/+2265
|\| | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging: fix Mac framework build remove compiler warnings caused by ASCII conversions Fix copy2build output path for QML plugin. MOBILITY-2975: draft version MOBILITY-2891: route dialog, map component remove old Maemo5 code make QtLocation work while Qt is compiled with namespace
| * fix Mac framework buildAlex2011-06-281-1/+2
| | | | | | | | | | qt_module_config requires TARGET as input. Hence we have to pull qt_module_config a bit later than expected
| * remove compiler warnings caused by ASCII conversionsAlex2011-06-2819-129/+129
| |
| * Fix copy2build output path for QML plugin.Xizhi Zhu2011-06-272-2/+2
| |
| * MOBILITY-2975: draft versionNatalia Shubina2011-06-271-1/+109
| |
| * MOBILITY-2891: route dialog, map componentNatalia Shubina2011-06-2715-236/+1152
| |
| * remove old Maemo5 codeAlex2011-06-212-538/+0
| |
| * make QtLocation work while Qt is compiled with namespaceAlex2011-06-21372-821/+881
| | | | | | | | Task-number: QTBUG-19972
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-stagingQt Continuous Integration System2011-06-171-98/+211
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging: Updates terms and conditions for the Nokia maps plugin.
| * Updates terms and conditions for the Nokia maps plugin.David Laing2011-06-171-98/+211
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-stagingQt Continuous Integration System2011-06-153-8/+12
|\| | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging: add missing tests.pro remove old qmake debug code and obsolete include paths honour the configure -nomake tests/demos/examples flags in qtlocation
| * add missing tests.proAlex2011-06-151-0/+2
| |
| * remove old qmake debug code and obsolete include pathsAlex2011-06-151-6/+0
| |
| * honour the configure -nomake tests/demos/examples flags in qtlocationAlex2011-06-151-2/+10
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-stagingQt Continuous Integration System2011-06-152-0/+495
|\| | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging: remove trailing whitespaces add system tests
| * remove trailing whitespacesNatalia Shubina2011-06-151-6/+6
| |
| * add system testsNatalia Shubina2011-06-152-0/+495
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-stagingQt Continuous Integration System2011-06-154-81/+0
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging: removed old files
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 18:20:18 +0000