| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
In a preparation for final cleanup in dev/Qt6.
This amends the recent change in QtNetwork where
we deprecated ambiguous signal overload.
Also, fix old SIGNAL to use the proper name.
Task-number: QTBUG-82605
Change-Id: Ifc92ce4569ba15ac5429fe379f134a6dbe3a5f73
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|
|
|
|
|
|
|
| |
This reverts commit b482674e51c097fccffa1e1cc32b4843ad393894.
Reason for revert: naming in QProcess is considered to be the correct one.
Change-Id: I6722adfc06b351c76fb432628a678c4ce887d594
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|
|
|
|
|
|
|
|
| |
Which is QNetworkReply::error(). Use QNetworkReply::networkError()
instead.
Task-number: QTBUG-80369
Change-Id: Id41166a72c0d14bc77d9ec853db2f665617195ee
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
This way pages can be changed without resetting the model.
To achieve this, new members into QPlaceSearchRequestPrivate
are introduced, to keep the relationship between a request
for one page, and the previous or the next page.
In this way sparse population of the model becomes possible.
Change-Id: Ic8db0281408f3500ba83f78c7e152ee0b68cd099
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|
|
|
|
|
|
|
| |
This change makes it possible to subclass QPlace
with custom private implementations.
Change-Id: I363c0e8b7db41d9a8400ce6dbddf5405c619eeef
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch tries to simplify the code removing the contained m_reply
from all the Geo[Map,Route,Geocode,Places]Reply classes.
The need for m_reply was associated to the "abort" method, but this
can be solved by emitting a signal in the superclass abort() method,
and connecting that to QNetworkReply::abort() in the constructor.
Since QNetworkReplyHttpImpl always sends an OperationCanceledError
it should then be safe to call deleteLater() on the network reply
in the slot connected to QNetworkReply::error
This patch also prevents the series of
"QCoreApplication::postEvent: Unexpected null receiver" warnings
that are generated due to deletingLater already deleted objects
(abort() emits an error, the reply is destroyed inside the
onError slot, but also in the abort() method).
Finally, this patch removes the setFinished() call in
QGeoRouteReply::abort() since the documentation does not mention
this, and all the subclasses do not perform this operation and
emit the corresponding signal.
tst_qgeoroutereply has been adapted accordingly.
Change-Id: I226ee163e7bed784dd7f0da1522e651459543bca
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
|
|
|
|
|
|
| |
... and QJsonObject::keys()
Change-Id: I9a8ba44406a1e2cbdfffd266d2b5cb664f7440fc
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
This is of relevance for static Qt builds
Task-number: QTBUG-43681
Task-number: QTBUG-45214
Change-Id: Iea9b4a7cad055dc47265bb51fe2654af80e356b7
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The old name is not advertised anymore but the plugin can still be loaded
using the "nokia" key. This will be removed by later versions of Qt.
Adds a QGeoServiceProvider unit tests
Change-Id: I01f36f1bb19d31e0855e90c1605b99e61ee4450b
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The terms and conditions were not accurate anymore. Instead we refer to
the relevant URL. In general the Nokia plugin is no different than
other plugins. The user must comply with each services T&Cs.
Nokia and Ovi don't exist anymore. The service runs under the Here
term these days.
Change-Id: Ie73b5cc9577946a2e1ce433ed67e0bca0b894a57
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
| |
Change-Id: I3007aa04d3dbc0e00cb0a43987d64d01ddf91edd
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ia1e333be7fec8898de609d9b9303b1ad7687632e
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
| |
This replaces a lot of old QLatin1String cases
Change-Id: I47aec711f5e00de68bde6c2c8ee09506f577cfd4
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This complements 1d0966c6924876655c52725e779a7aa24866ff60
Not all service providers support arbitrary offsets when requesting
place content. The offset attribute has been removed, instead service
providers can supply a previous and next content request query in the
form of a QPlaceContentRequest.
Change-Id: I6239b42c31bed5dcd6645d86d5a48d7e6a667f46
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
| |
Not all service providers support arbitrary search offsets. The offset
attribute has been removed, instead service providers can supply a
previous and next search query in the form of a QPlaceSearchRequest.
Change-Id: If68e969b06f909f3fa62718656cbef70d1bf84a6
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
|
|
| |
Place recommendations are no longer wrapped in a "results" object like
other search requests.
Change-Id: Idef11bf08818e07192657ffbadca0e0d610b6137
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
1. Rename QGeocoding* classes to QGeoCoding*. This emphasizes the QGeo
prefix rather than the geocing word. The QML interfaces continues to use
the Geocoding* as they don't a prefix as such.
2. Rename QProposedSearchResult to QPlaceProposedSearchResult. The class is place
related and should carry the QPlace name prefix
Change-Id: I428c7e6368774a9f199db5c113de11649e4a665c
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
QtPositioning is not dependent on any gui component and mostly
covers everything around the retrieval of position information.
QtLocation covers place, map and navigation APIs.
Several documentation issues were fixed during the process.
Change-Id: I98e2a53065549a2fc43f93a75b4f65b5bc884c92
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add support for Nokia's explore functionality in places. This adds the
ProposedSearchResult search result type. The proposed search result has
a QPlaceSearchRequest, which can be submitted to
QPlaceManager::search() to perform the proposed search.
This has the added advantage that any arbitrary search request can be
returned as a search result. To facilitate this further a search
context field has been added to the place search request. This field
can be used by backends to store additional search context. Other
relevant fields should also be filled in. This allows additional search
context to be kept.
The Nokia v2 places implementation has be updated to use the explore
feature and to return ProposedSearchResults as well as place results.
Task-number: QTBUG-24874
Change-Id: Ib20c5a8c8a60e6bf16f38dcd75961a752b8b1b32
Reviewed-by: Alex <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: I5b0cb7d56997ad7b91c073b3e02b31d0368fdcfa
Reviewed-by: Alex <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Main code, tests and docs updated.
For consistency (with minimal disruption to the Qt 5.0.0 release),
namespaces with a "Qt" prefix were renamed.
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: Ic728cbbe39e0140dca1cdee24257dda095c9a478
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
| |
Change-Id: I61ae1bd1a9f68d120d4e11635f306374b1f494d0
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: Ic1390da64a219642fa1e1482a7677a4c2db15cbc
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Previously a CommunicationError was returned if the id did not exist,
this was because an incorrect id would result in a non-existent URL
being used. Now we make the assumption if the URL content is not
found, then it must be because the id did not exist. In such
a case we can return a PlaceDoesNotExistError.
Change-Id: Ibfc21b826e0514fd694cb69d0372ef99e46e768e
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Previously a CommunicationError was returned if the id did not exist,
this was because an incorrect id would result in a non-esistent URL
being used. Now we make the assumption that if the URL content is not
found, then it must be because the id did not exist. In such a case
we can return a PlaceDoesNotExistError.
Change-Id: I50ddacb2341639dd6e227e795cefc5e92eea3d6e
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
| |
Change-Id: I6302b2e40961732e98ed61de0ce5518691740a11
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I022ccad6a1d53ec0f3da14e1ef8fe0e2b27e0687
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I19a1ccd7cf29fa50c6e40f9428ac92da78258450
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
| |
The engine was not emitting a finished signal when the search reply
errored out due to bad search arguments.
Change-Id: I7010da1de31c98bc5a082fbf116e3ff6f3bf136b
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
| |
Recommendations can be incorporated into ordinary searches.
this is more convenient for the developer.
Change-Id: Ifd3e040b6b7a964227981175b074ca4f52d7579c
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QGeoBoundingArea is used for describing more than just a bounding area.
Renaming it to a more appropriate name, QGeoShape. The same is done
for subclasses and QML equivalents.
In C++:
QGeoBoundingArea -> QGeoShape
QGeoBoundingCircle -> QGeoCircle
QGeoBoundingBox -> QGeoRectangle
In QML:
BoundingArea -> GeoShape
BoundingCircle -> GeoCircle
BoundingBox -> GeoRectangle
Change-Id: I93c6df8f1b6c5179ed52fd8354a05f709063b1cf
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
|
|
|
| |
The different types of search results should be spearated into
different classes.
Change-Id: I21f43e7979f9f0ae1dfb51e0b619a7c855a469bb
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Update to the new places service URLs.
Remove the /places path from the host name.
Task-number: QTBUG-24984
Change-Id: Ib0be6505a457e16bb5ff2f309a2c56c8b3ef1c57
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
| |
Change-Id: I35a2a5ca9d4c4dc20e291051666bb88f4264ab33
Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is an plugin parmeter called places.icons.custom
that defines whether custom 3rd party icons or nokia
icons are presented to the user for the jsondb plugin.
For the nokia plugins, nokia icons can be subdivded
into two types. The first is explictly set icons, the second
is icons generated from the categories.
In both cases the base icon is identified by the
nokiaIcon key and a base icon value.
However in the case of a generated icon there is
a nokiaIconGenerated key that is set to true.
When saving a place to the jsondb plugin, if
the icon is generated, the icon data is not saved to jsondb.
The category data however always is. When the place is
retrieved from jsondb, the base icon will be generated from the
category data.
If an icon is not generated, then the base icon is saved
to jsondb under the "nokiaIcon" field. When
the place is retried from jsondb, this field will be used
to provide the base icon.
Change-Id: I9100011c519185719cdd7b62e12c2386f7f0f8d7
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The OVI name was discontinued last year. This change reflects this
change. Also the product is no longer called mobility.
Change-Id: Ib6653eef8ad117f8bfd527719994661223d6c6e9
Reviewed-by: abcd <amos.choy@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When a request is cancelled or fails the emit finished is called. This
causes any subsequent requests to complete immediately, resulting in no
more searches working. Also, the initial state of the plugin should be
Null which correctly matches the documentation.
The state change after the cancel should be overwritten to cancel.
Change-Id: I22c2ffe92fbe70e6391ae4f049368edaeafb1c4d
Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
If no theme is provided the platform theme is used.
A developer can explicitly request to use the
non-platform specific default theme by specifying
a theme plugin parameter of "default"
Change-Id: I92b9f6511cdce7aa95ea7e67c731c6d63c8783f3
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
| |
Version 1 was a development enabler and is likely to be removed
before the final Qt 5.0 release.
Change-Id: I8f8bbbf48e8486de794751b92f73770e36a58186
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
| |
Change-Id: Id82447fd162ed94fb51283ff4855d4b048f0051a
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I58a7191dae9cd441025cad658d82422561f216f6
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
| |
The provider attribute is necessary to facilitate cross-referencing
of between managers/plugins.
Change-Id: I08af837677e7565236bed80c7375d83b66f53fb9
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Place search results can be either sponsored or organic search results.
This adds a sponsored field/role so that applications can distinguish
between the two.
Change-Id: I10c9a5699b1c013a2b7ba8ac8100348213a68b8a
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
The name formattedAddress gave the impression that the address was
always complete, which was not the case. Rename to "text" and document
that it is the recommended text to use to display the address to the
user and that it is not always complete.
Change-Id: I6c9757ded63e43c52d9764724c4bd0e408c76322
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
Support is added in such a way that both the v1 and v2 REST APIs are
supported by the plugin. By default the v1 API is used. The
application developer can explicitly select v2 by setting the
places.api_version plugin parameter to 2. At some point the default
will change to v2 and support for v1 and places.api_version may be
dropped entirely.
The new REST API is documented at
http://api.places.lbs.maps.nokia.com/places/static/doc/index.html
Change-Id: I643d10202ab387346fa4658f096a6ddbb5e80e34
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|