| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: Ifd6b6040bd00357bf658f5b51215d4208823bab1
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: Ia300cfc5746204fcfc159c36e6e4f082ebecea69
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
| |
DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
Change-Id: Ifd9c031343b793f6da2a1ac595d54cb0b1176e5c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.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>
|
|
|
|
|
| |
Change-Id: Icbf4870866053bb6812f6ff0084744d6c2566e6f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This replaces the GeoShape, GeoRectangle and GeoCircle QML elements with
value types. A value type is a better fit for shape types. It is very
similar to a rect with some utility functions.
Declare QGeoShape, QGeoRectangle and QGeoCircle as movable types.
Update documentation.
Change-Id: Id6c48e1e841c68f2f0c5c6a9c4a6580a57e2dfb6
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
| |
Change-Id: I63307317d6b4607194ad26f88db90aba62d00adb
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-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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The old schema was fragile due to the fact
that there was dupliation of reference data.
E.g. if A->B->C ('->' means parent of)
then C would have a "linage" consisting
of [A,B,C], in addition to a parentUuid of B
Likewise, B has a lineage of [A,B] and
a parentUuid of A.
When assinging a category to a place the lineages
of the categories would be combined into an
allCategoryUuids field, eg a place belonging to C
would have allCategoryUuids consist of [A,B,C].
The idea being that if we are searching by category A,
then one could look whether a Place's allCategoryUUids
field contains A.
This duplication of data introduces complexity making
maintenance of data integrity more difficult.
Instead Categories only reference their parents,
and Places only reference categories they are directly
assigned to.
If someome were to search for category A, we would traverse
through the "cached" categories of the engine to get A and
all of its subcategories, then search if the place
categoryUuids field contained A or any of its subcategory
ids.
The cost of this approach is that the "cached"
categories must always be up to date. We listen
to any saved/removed category notifications and
re-initialize the categories. There is a small window
of opportunity between a save and update of the "cache"
where the "cache" is incorrect.
Change-Id: I841c86b91c274573a84c7c761f2105e3d1851498
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>
|
|
|
|
|
|
|
| |
This makes the plugin compile with disabled deprecated functions.
Change-Id: I86c30126a0de1f816a9c734f6a014310442a7399
Reviewed-by: Ian Chen <ian.1.chen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
-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>
|
|
|
|
|
|
| |
Task-number: QTBUG-26505
Change-Id: I908ccf8fe5fd95e3c78ff8ac7cce335ed8dbf358
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: Id3d5a0dd04d399ccb5252c3820f76102144f2802
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I725af80fdd47d3d0bb50c6c2f02058bec7736b75
Reviewed-by: Aaron McCarthy <aaron.mccarthy@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: Iceb3777ea3518988971bec8b484e9e05fa606db4
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I58c4992d4f189effdbd43df691d6eb01e730c422
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>
|
|
|
|
|
|
|
| |
re-enabling them would not work anymore anyway
Change-Id: I272a27c54a715fdde07990f32ad397a337fd96fb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-26042
Change-Id: I9aa24a484f3fba6fb8f3e0c3309455a8ab1b9029
Reviewed-by: Ian Chen <ian.1.chen@nokia.com>
|
|
|
|
|
| |
Change-Id: I9fa6318e245ff6c748022fe06768da8682dd12f5
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I731c61636e714f1891892603dfd9068289ac7a86
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
| |
Use toLatin1/fromLatin instead of toAscii/fromAscii.
Add message format string to qCritical usages.
Change-Id: I95c863fae6997cc8f85e0a6d16fdebba607a3ce1
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
|
|
|
|
|
|
|
|
| |
Previously the gypsy backend was only being built when CONFIG+=meego
was set.
Change-Id: Ia738ea270252206974f5fcdf146a53ba221925f0
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
|
|
|
| |
Previously the geoclue backend was only being built when
CONFIG+=meego was set.
Change-Id: I55f723d597aa7af159edb78e24bd2bf0116ae7dd
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
| |
Change-Id: I9d73ec615b2799ec64d23ac0702699eec93de968
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- abuse of QMAKE_PKGCONFIG_REQUIRES
- QT_BUILD_*_LIB defines (automated now)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- pointless QPRO_PWD assignments
- pointless DEFINES+=QT_MAKEDLL
Change-Id: I3f129ee42289aa409418eb9d29b1902cc40370f9
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I15247291dc56c4fd7ae2415a3de1541c9f8b295b
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The Icon class in the jsondb plugin confuses qdoc because the name
clashes with the QML type "Icon" in the QtLocation import. This is a
workaround for QTBUG-26273.
Change-Id: I5453c0f6a8abc9ccfa67239a5e47d0fb3f240a29
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
|
|
|
| |
The v1 engine functionality was switched off some time ago.
The class was not removed at that time, remove it now.
Change-Id: Ib9ed219306d9169b0ff0d3734bd588f5b3b73bf4
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>
|
|
|
|
|
|
|
|
|
| |
Example to have search option to sort by name or distance if the jsondb
plugin is selected
Task-number: QTBUG-23412
Change-Id: Ia44ee8798d75cb816d5ccb565f96adc3a9ccae2d
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The new REST server doesn't support did you mean corrections.
This combined with the fact that a more generic solution
to provide corrections is intended to be provided later on
means that it is not worthwhile providing corrections
as they are currently implemented, they will soon be
deprecated anyway.
Change-Id: I674aba99dc3cdc0eb0fc48d928a2146f5e792a2f
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>
|
|
|
|
|
|
|
|
| |
The latter is to be deprecated.
Change-Id: Ibba791706fd1c5f0057d95c01bf7414df0c44f83
Reviewed-by: Cristian Adam <cristian.adam@nokia.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The preliminary C++ Maps API was exposed to provide an interface
between the QML plugin and the geo services plugins. Mark it as
private API for now as it is likely to change when the full C++ API is
developed.
Mapping functionality is currently only available through QML.
Change-Id: Id16e0f1a2165c70192047dffa40e69ab1f29ba69
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
|
|
|
|
|
|
|
| |
Remove the qFatal() and return a null pointer from the factory instead.
Change-Id: Icbc263092cb7e3ce824602e656cc1243b359249b
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
|
|
|
|
|
|
|
|
| |
QStringLiteral doesn't work on GCC outside functions nor
in template-arguments lists.
Change-Id: Ib59e3fc7e5233efb369f73703775057ceff8be54
Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
|
|
|
|
|
|
|
|
| |
The places v1 is no longer supported on the backend. Users shoudd
upgrade if useing the C++ interface.
Change-Id: I97ff768b0b3559f3ae38d4f310bc8948f3dc122a
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
| |
Change-Id: Ia110416b1cd64425abcb3ebcf79209b635050b0b
Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
|
|
|
|
|
| |
Change-Id: I35a2a5ca9d4c4dc20e291051666bb88f4264ab33
Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
|
|
|
|
|
|
|
|
| |
- Assigned/unused variables.
- Signed/unsigned comparison
Change-Id: I712baa90442f9fc9699965e7c7e1c5f4ca319aab
Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Use of weakPointer to prevent accessing deleted memory. Plus thread exiting to
cause the fetcher and thread to destroy themselves.
Additional use of weak pointers to deal with the complexity of the mapping manager
destructing before the declarative objects.
Task-number: QTBUG-25797
Change-Id: I6a27568580c1a00f7588565ff7e35d63eb5dd785
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I293fbda64138319bf12ebbea5d26b5b113d06351
Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-25497
Change-Id: I43357def9db11bfbe5f9fe14c963f22f11f05310
Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
|