| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Turns out that our CI does not support repos without
any tests. This is treated like an error and leads to
integration failure.
This patch fixes it by disabling tests in
coin/module_config.yaml. This config should be fixed
when QtLocation tests are enabled
Task-number: QTBUG-97084
Change-Id: Ib06e865fe2836806bbbee34345f06b471dd48660
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 23f32792ad53e23bbafbff6d7667f0bb0f69fc53)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch adds qHash overloads to QGeoShape hierarchy, allowing to use
the classes as keys in QHash.
Note that the actual qHash overload is required only for the base type.
All the derived classes are correctly hashed using the virtual method
in private d_ptr.
Task-number: QTBUG-95163
Change-Id: I186f9d396e698187ebf0363d96c19e324db10905
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit cc6d520ee633d15b18724e3b7e6ecff25570dd0d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch changes all streaming operators in QtPositioning to
hidden friends, so that they can be found only by ADL and do not
pollute the global namespace.
It also updates couple of tests to make sure that we cover the
streaming operators with test cases.
Task-number: QTBUG-95163
Change-Id: Ie78b31301d9fb6f658e82114d9637b197e72710a
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 2bf5bf8caf01311eac9218a31af27f82bfc063d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch changes all comparison operators in QtPositioning to
hidden friends, so that they can be found only by ADL and do not
pollute the global namespace.
Note that the comparison operators are removed from the
QGeoShape's child classes. Only the friend operators for the base
QGeoShape class itself are implemented. The ADL will manage to
correctly detect these operators, and then the virtual methods
of the private d-pointers will be called.
Task-number: QTBUG-95163
Change-Id: Ice348a8a219395b0470cd0202b1fcc6673d575e2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 4fc52ffe0b236f7f15841d881102f8b485d50df7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There were two problems:
1. The deserialization method was still assuming that QList uses int to
index the elements, so it tried to extract the polygon and path size
as int, while it was serialized as qsizetype.
2. The QGeoPath didn't serialize and deserialize its width - it was
simply lost.
This patch fixes both problems and adds some unit-tests to cover these
cases.
Change-Id: If0ac87731b4481fde6b91e71fb121b3e916b0bfe
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit b7fa0a29ff70dd3316941cf9ec9936d7c1a8434c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This method was deprecated in Qt 5.9. We can remove it in Qt 6.
[ChangeLog][QtPositioning][QGeoShape] Remove QGeoShape::extendShape()
method. Use QGeoCircle::extendCircle() and
QGeoRectangle::extendRectangle() for these specific shapes.
Task-number: QTBUG-90491
Change-Id: I72cda208ae9555d86836230b57ccc1ed0fb1bd55
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Was planned to Qt6 some time back.
Renaming QGeoPolygon::setPath to setPerimiter, and also updating the
type of Q_PROPERTY to get rid of ambiguities.
Protected getter and setter for perimiter property are also removed,
as they are now not needed.
[ChangeLog][QtPositioning][QGeoPolygon] Rename QGeoPolygon::setPath()
and QGeoPolygon::path() to QGeoPolygon::setPerimiter() and
QGeoPolygon::perimiter() respectively.
Update the type of perimiter peoperty from QVariantList to
QList<QGeoCoordinate>.
Task-number: QTBUG-90491
Change-Id: I5f764c9fc7759c5bddd21a6d573c8af0e4ed4138
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
| |
It is not allowed to include files within Qt namespace.
See 5b99f3a3 in qtbase dev.
Change-Id: Ic86986ebe5d6beafa32c7634ffb1d4631c411bf9
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix multiple warnings caused by invalid documentation configuration,
missing QML module specifiers, wrong QML type names, incorrect
arguments for the \fn command, and missing documentation.
Remove incorrect statement from the example usage of the Waypoint
QML type.
Use 'QtLocation' as the name for the module throughout the docs.
Clang (used as the parser for QDoc in Qt 5.11) was unable to
resolve the path for qlocation.h, causing QDoc to omit the
QLocation namespace documentation. Fix this by including the
file explicitly from qlocationglobal.h for documentation
builds.
Change-Id: I2bd790db1ff5ad96f0cdb415a682b97593b3a6dc
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
This patch introduces a new QGeoShape, QGeoPolygon, together
with helper functions in the location singleton (QtPositioning.*)
to create and convert geopolygons from QML.
[ChangeLog][QtPositioning][QGeoPolygon] Added QGeoPolygon shape.
Change-Id: I111c576d7428f2a953f0459d16c25eea7ab2bd7c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|
|
|
|
|
| |
Change-Id: I7d0bb4eac89ca9a018f71faa9d73f62d97a24085
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
qdeclarativegeomap.cpp: 1327: warning: Can't link to 'Component.onCompleted'
qgeopath.cpp:117: warning: Undocumented parameter 'width' in QGeoPath::QGeoPath()
qgeopath.cpp:117: warning: Undocumented parameter 'path' in QGeoPath::QGeoPath()
qgeoshape.cpp:90: warning: Undocumented enum item 'PathType' in QGeoShape::ShapeType
qgeoshape.cpp:231: warning: No such parameter 'QGeoRectangle' in QGeoShape::boundingGeoRectangle()
Change-Id: Ie57dff2aabe82d61b8122362a396ac706939c3b3
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
As the collection of QGeoShapes grows, this method loses its scope, as
it would have undefined behavior for certain shapes (polygon, or
polyline, for example).
Therefore the base class virtual method is now deprecated, with the
documentation pointing to the specific implementations instead.
Change-Id: I9717df092b8686b5413556858e9dfe7eaa92dd80
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch adds an addition qgeoshapes, QGeoPath.
This represents a geographical path where each consecutive geopoints
are connected along the shortest line of constant bearing
(rhumb line).
The path has a width, in meters, that is used in the contains()
method to decide whether a coordinate is or not on the path, based
on shortest distance to the rhumb line segments.
Change-Id: Ia02780e3c8ac6c6d63a6083f53ea0677f8a21a1d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
this patch introduces QGeoShape::boundingGeoRectangle,
which returns a QGeoRectangle containing the latitudinal/longitudinal bounds
of a geoshape.
The bounding geo rectangle is projection independent, as it returns
a georectangle containing the min/max latitudes/longitudes of the
shape.
Change-Id: Ie3a83ec41f87ea3753899d2278e664fe2469f778
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new LGPL header instead of LGPL21 one
(in those files which will be under LGPL v3)
Change-Id: Iaee1a5fd53291752a1891710ee375ca32778b142
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
They are more general and are linked to from other pages too.
Change-Id: I828008e3692a593bf9343346508b9c0ad8183108
Task-number: QTBUG-45415
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
|
|
|
|
|
| |
Change-Id: I396f937f945f158e7bb19f1f7e4633cfcdeffb72
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|
|
|
|
| |
Change-Id: Ia1e333be7fec8898de609d9b9303b1ad7687632e
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
- Removes subsidiary extension from Qt Company
- Replaces remaining occurrences of Digia in BSD and LGPLv2.1
Change-Id: I7467a6744af7d1c3aef3c29118f219399162a18c
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This affects all QtPositioning related code and the test code
in the entire repository.
The Qt Company is set as new copyright owner and the
copyright year is bumped to 2015.
Change-Id: Iee0e990680683c20f5920e49cc1063ea9349e2cd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
| |
Change-Id: I1a98df26582957b0df136e98acf5d2754fe45295
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The value type wrapper code was completely removed. Instead
QGeoShape & derived classes and QGeoCoordinate use Q_GADGET
to advertise their meta data which in turn allows QtQML
to dynamically discover the types when needed.
This implies that the above C++ classes become larger as the meta
data is permanently added. On the positive side all QML value type
wrapper were removed which reduces the QML plugin size. At the
same time it becomes significantly easier to use those types in
other QML plugins such as the QtLocation one.
Unfortunately this change comes with an unavoidable behavior change
as well. Previously is was possible to set a width and height
on an invalid QML rectangle. In the case of an invalid rect it was
made valid (setting center to 0,0) before setting the height or
width. The QGeoRectangle class explicitly aborts calls to
setHeight() and setWidth() in case of an invalid rect. From
now on the C++ class behavior is used in QML too. This was
the reason for the change to tst_map_routing.qml in this patch.
Incidentally the documentation always referred to the QGeoRectangle
documentation and thus always stated the now new behavior.
Documentation for the value types and the relevant behavior changes
will be re-added in a later commit.
Each Gadget must be registered
using QMetaType::registerComparators<T>() to enable == and !=
operators in QML. Unfortunately QMetaType requires the operator<
which does not make any sense for the value types touched by
this patch. Right now, a warning is printed. Attempts will
be made to remove the operator< requirement in QMetaType.
Otherwise the warning has to be removed before the release
as they are printed very often.
[ChangeLog][QtPositioning][Important Behavior Changes] The QML
rectangle type ignores setting of the height and width if the
rectangle is invalid. Previously the property setter changed
the rectangle center to QGeoCoordinate(0,0) before setting the
height and width of a previously invalid rectangle.
Change-Id: Iab98ede58066ce03b2b4e0ce03ed85ba7ecb1020
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It is frequently useful to calculate the geometric center of a shape.
Both QGeoCircle and QGeoRectangle already define center() functions,
however, the application developer must cast each QGeoShape into either
a QGeoCirlce or QGeoRectangle before calling. Providing
QGeoShape::center() allows application code to be simplified.
Existing QGeoCircle::center() and QGeoRectangle::center() functions are
kept for compatibility.
Change-Id: I92b727ab5e713f70174588a27040446c992ae14e
Reviewed-by: Alex Blasche <alexander.blasche@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>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/location/qdeclarativegeomap.cpp
src/imports/location/qdeclarativegeoroute.cpp
src/imports/location/qdeclarativegeoroutemodel.cpp
src/imports/location/qdeclarativegeoroutesegment.cpp
src/imports/location/qdeclarativepolygonmapitem.cpp
src/imports/location/qdeclarativepolylinemapitem.cpp
src/imports/positioning/positioning.cpp
Change-Id: Ieaa5f567d2144d0267e7eef5bd75bde7e0079fbe
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The QML API remains available under 5.0 though.
Change-Id: I037b82e5b12825db610e8458d6c82122ecde4f44
Reviewed-by: Erik Mattsson <erik.mattsson@appello.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|/
|
|
|
|
|
|
|
|
| |
It will create the smallest possible rectangle that contains all of the
coordinates. This is accessible from qml using the locationsingleton.
The plan is to include the ability to fit the view-port of the map
to a georectangle.
Change-Id: I616ac8ef169f697e53a3d9ebcf114f4f2cde8298
Reviewed-by: Alex Blasche <alexander.blasche@digia.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>
|