| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Change-Id: If3ebc0821be0d0206522adf8ff10040e80e34414
|
| |
| |
| |
| |
| |
| |
| | |
This was introduced by 5a4ffa0de0ecc666a514ef60f0149a76d25b040d
Change-Id: Icccf0c8cd3154c102fd93b79e81199e043f7d0bb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I5ec9c700a0b69a556512efbd0bfd79c4c2119f9a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |\
| | |
| | |
| | | |
Change-Id: I8b84b78bf234556b7162066b8401630da2afb311
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added support for custom Mapbox API base URLs.
Fixes: QTBUG-82655
Change-Id: Ieebcc834f8aeaeb223b036100e5edadd55749101
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/imports/location/location.cpp
The change fixes the bare minimum of what needs to be done
to compile and run. This includes the following issues:
1. Fix build failures as a result of QMetaType changes in qtbase
moc now stores the QMetaType of properties as a result of
46f407126ef3e94d59254012cdc34d6a4ad2faf2 in qtbase, which requires
full type information about the property type inside the moc generated
source file.
Many of the property types were forward-declared, and this resulted
in build errors like:
"invalid application of 'sizeof' to an incomplete type 'QDeclarativeGeoMap'"
2. Adopts QtQML API changes. A private QJSValue ctor was removed.
The "replacement" is QJSValuePrivate::fromReturnedValue(..).
3. The mapboxgl 3rdparty backend does not compile at this point in time
and seems unmaintained. For the time being, the mapboxgl backend is disabled
in the interest of keeping qtlocation closer to dev HEAD of other
Qt modules.
Change-Id: I756e1c2effb29eaaf96a61a28c1c17338774b77c
|
| |\ \
| | |/
| | |
| | | |
Change-Id: I72fa0c1d41db884c752820a8d1fb5a7aa55762bc
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ifc34a27c89d7d8a63e66e9858f8e6dd3cd9522ab
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: I66502770edaa22deb2644ce5071df4894c4d0f97
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes: QTBUG-82417
Change-Id: Id9be6f9e248612bce3a17a65d5f73f7ec4c9f45f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I3b030728b32af6e340738583f78b2cfb0d2df11a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I8716c94b2c3f1fb995e933fe5be736e94ff161ce
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This change introduces a metric-based implementation of the
Ramer-Douglas-Peucker line simplification algorithm to generate a
LOD pyramid for the polyline geometries.
This comes with a related property (in MapItemBase), lodThreshold,
that can be used to change the threshold after which no simplification
will be used.
By default the value of this property is 0, meaning that the
behavior will be unchanged and no LOD will be used.
This change also introduces LOD on map polyine objects QSG, for which
no property is introduced, and there's a default threshold set to
zoom level 12 (which appear to produce acceptable results).
Finally, this patch makes use of a threadpool with 1 thread
to enqueue geometry simplification tasks, which would otherwise
freeze the UI when computing for the first time.
Support for geometry simplification is currently added only to polylines.
It might be of interest extending it to polygons as well, once
a proper strategy for handling the simplification of inner holes has
been identified.
Finally, extending it to circles could be of interest, while potentially
bringing only minor benefits, as circle geometries are currently fixed
to 128 vertices.
Also adds a MapObject-based delegate to the geojson viewer example.
Task-number: QTBUG-46652
Task-number: QTBUG-38459
Task-number: QTBUG-49303
Change-Id: I64b5db4577962db17e5388812909285c9356ef0d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This patch changes the implementation of the scenegraph-based
mapobjects (those created by QGeoTiledMap) to be the recently
introduced one sporting shader-based map projection.
This is much faster than the previous, but may introduce small glitches
at this time (mostly on minified polylines).
Adding polyline LOD simplification will solve this problem.
Compared to equivalent Map Items (that is, Map Items backed by the
same underlying implementation), map objects now are approximately
1.5x faster.
This measure has been gathered using medium-size polygons (contained
in the file 10_countries.json from the geojson_viewer example).
The difference is caused by the additional QtQuick geometry related
operations (essentially projecting the bounding box for each item)
present in MapItems.
Smaller polygons may therefore yield larger improvements, larger polygons
the opposite.
Change-Id: I3fc92b02b74a3a4d001e69755949a98f80d8a3d3
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The new approach introduces a root node for all objects, that is
repopulated at every repaint.
Change-Id: I4562e1aaa18999a03e8c38fe3bf59fe41f14dd70
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
With this change, all the geo-to-screen conversion,
and the triangulation operations for geo polylines
and geo polygon are performed either at set time
or in the shader.
A separate bounding box geometry is processed
in the old way to provide a correct QtQuick Item
geometry, that can be used for nesting mouse areas,
performing translations, input event delivery, etc.
With this approach, performance are improved by more
than one order of magnitude in average, but complex
geometries will of course benefit more.
It also adds correct rendering support for polygons
with holes, previously only rendered correctly
by the MapboxGL plugin.
The polyline shader has basic miter joins. The miter is
skipped if the angle is too sharp to avoid complicating
the implementation.
This shader introduces some glitches when the polyline
is minified, for which the real fix is to
have LOD for the geometry, and render simplified
geometries at low zoom levels (added in a subsequent patch).
Note: this approach, at least in its current implementation,
does not support enabling layers on individual items, only
on the Map element.
Task-number: QTBUG-49303
Task-number: QTBUG-38459
Change-Id: I0c2dc0bf364d32f74ca7c4014f6d66e6219c8ae4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ibbf013f247254ac5fd01071b1e90da648532eec3
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I9a01c76474a0ca9d8a06f9c768f3d16ef97d3be7
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\ \ \
| |/ /
| | |
| | | |
Change-Id: I453207cbd09ee4901def858193f33d8cef80a2dc
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Set parent for incubated objects in MapObjectView to the view.
Also properly set component completed when removing the view from
a map and then readding it.
Finally silence the useless warning about MapObjectView
being unsupported, as the default MOV is basically what's wanted.
Change-Id: Iecbc345ced99754d0d09112b4b30eaca2bb078e5
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Also emitting signals when the parent is changed internally
(e.g., in a MapObjectView).
Not revisioning it since it is used both in QtLocation
and in Qt.labs.location, and setting it to 15 would break
the property in map objects.
Change-Id: Ib11b18b7fcc507b5a11481f84f2bf0bd8c9f558e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This patch also parents it with the object also fixing memory leaks.
Change-Id: I74a21176b1d2450b10a21f92321520ca2c6e88e0
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Bump the submodule to include the one build fix for sqlite3.
* Rename VisualDataModel to DelegateModel (it's been the latter for many
years and now the old name vanished)
* Fix dangling pointers into QList. In clearMapItems() we iterate over
m_mapItems and call removeMapItems(), which also removes from the same
QList (now vector). The same goes for m_mapItemGroups.
Change-Id: I4c229fd2cf1bce76d6ad5ffae4bdbda7fe8e6a18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I0dc35c36208833779d26d5090859baf43199eb9a
|
| |
| |
| |
| |
| |
| |
| |
| | |
error: implicitly-declared ‘QGeoRouteLeg& QGeoRouteLeg::operator=(const QGeoRouteLeg&)’ is deprecated [-Werror=deprecated-copy]
note: because ‘QGeoRouteLeg’ has user-provided ‘QGeoRouteLeg::QGeoRouteLeg(const QGeoRouteLeg&)’
Change-Id: Iad959315ad374ef288f5fffd15d68cba005f9e01
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
It is being deprecated.
Change-Id: I33a411f9b2fc18feabd3cc8d7f3a44b353e25639
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I95c7e221498d875eb407a3165c2b9e1be2a8b347
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix missing/incorrect parameter documentation, linking warnings, and
\instantiates references to undocumented/internal classes.
Remove mention of Navigator::currentRoute, as such a property no longer
exists.
Fixes: QTBUG-79811
Change-Id: I048a13109aa19f3db75e76611473d60a2396f028
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: Ifa572a6e1c0835e0ca6d5bf85cde1db854604cf6
|
| |
| |
| |
| |
| |
| |
| | |
[ChangeLog][QtLocation][MapboxGL] Added support for image sources
Change-Id: I5334f36e033d26824300d90ad8d9aacf3ac75ac3
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Emit on mapReady changed, and do not emit before then.
Change-Id: I1d5c657119cb63989cfa35f58ce57d24833f6438
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: Ia876d943c684fbefddd693f00a16b2f2cec18223
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I21ae20734645fc34b302409163f7400015d8302c
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I2900e1ccc5291148fdc7801c1b6af43ea611db28
Fixes: QTBUG-78712
(cherry picked from commit 9ac4e00e21f5fd7a1a53343d1cf9f4fcaeff01a5)
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This removes connections in map items to react on map changes.
A further improvement could be replacing item lists with QSets.
This might however have implications with plugins which
might expect ordered items.
Change-Id: I52dbd64ed22762b1e2d51d1bc38f496346e7a664
Fixes: QTBUG-76950
(cherry picked from commit 2bb07804f32e0c9cc7948a5cff0bcef81ae9d8c9)
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ia2dac783ce05bd87888b73b4225d133ada04af79
Fixes: QTBUG-78690
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: I1af75bedd02626b9fd121a04acfbb4418ce37d47
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Idc7cd6ad9f87e2fc511344bc4fc4b409da3b7f02
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\ \ \
| |/ /
| | |
| | | |
Change-Id: I219a1353a21d29177e0cd7f21d64c06a8f28fced
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I54bf3791d3d5e40fb9405c2f1527758fcfba8120
Fixes: QTBUG-78690
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: Id543d32c49c8efd1d7798d41bbee0e28c1742e12
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I786ab35a0e9c8dfa2c8124692289d98e8eee4a8d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
So that a user-specified list of items can be fitted without requiring
complex computations in JS to deduct the enclosing geo rectangle.
Change-Id: I4a36fe72a49d5fc3566ba0b9fe1db930c4008885
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I0aa13b6c472664ad2c6175fa800687598207ab8e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This property allows a user to disable the until now built-in behavior
that makes map items fade in or fade out between zoom levels
1.5 and 2.5.
By default the old behavior is kept.
[ChangeLog][Location][MapItems] Added property to disable the automatic
fade-in/fade-out behavior on low zoom levels
Change-Id: Id764f12d34db528f533f14fd561604507681f216
Fixes: QTBUG-76867
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... and of QLinkedList
Java-style iterators are going to be deprecated, or at the very least
banned from use in Qt code. Ditto QLinkedList.
Unfortunately, the module contains more than 120 uses of Q_FOREACH,
even though, according to my sources, its use was banned in Qt
implementation from the get-go. So QT_NO_FOREACH is currently not an
option.
Change-Id: I0f05e9c78dda259b0eac1bcdfc7dddfcddc4b908
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The code here is a bit tricky, as it relies on dynamic property
inspection, and therefore can't use the statically-typed Qt5
connection syntax to simply connect to a lambda to captures 'i' by
value.
But QSignalMapper is not just deprecated, its use here is also
overkill. Unlike your normal signal mapper, the code doesn't map
many source objects to different ints, there is actually one
QSignalMapper object _per sender_. But this use-case doesn't need
all the sender() inspection that QSignalMapper does under the hood.
It just needs a QObject with a map() slot that emits mapped(i),
where 'i' is a member variable.
Implement that.
Change-Id: Ib363144c8ab7997cb0a34c8c9c1a0c348fd38d57
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|\ \ |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I4f76eed0a59b602696c3f2c1c76df75246c69092
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-74391
Change-Id: I80ad167400fc2c61c310adef8b00df70b42404dd
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|