summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:29:21 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:29:21 +0200
commit2b2a5ba9abb0d2f7043cfdfdc144751aa5dd6452 (patch)
treefe8efd84d270b8b1a884f3da042400808fbd5b9f
parent0e64148b39ab7e7417d9d115ddc53631167989b1 (diff)
parent058427e68159fb286c465da32cb696f757ea2b52 (diff)
downloadqtlocation-2b2a5ba9abb0d2f7043cfdfdc144751aa5dd6452.tar.gz
Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"
-rw-r--r--.qmake.conf2
-rw-r--r--dist/changes-5.12.420
-rw-r--r--src/location/declarativemaps/qdeclarativecirclemapitem.cpp6
-rw-r--r--src/location/declarativemaps/qdeclarativecirclemapitem_p.h1
-rw-r--r--src/location/declarativemaps/qdeclarativegeomapitembase.cpp5
-rw-r--r--src/location/declarativemaps/qdeclarativegeomapitembase_p.h4
-rw-r--r--src/location/declarativemaps/qdeclarativegeomapquickitem.cpp6
-rw-r--r--src/location/declarativemaps/qdeclarativegeomapquickitem_p.h1
-rw-r--r--src/location/declarativemaps/qdeclarativepolygonmapitem.cpp6
-rw-r--r--src/location/declarativemaps/qdeclarativepolygonmapitem_p.h1
-rw-r--r--src/location/declarativemaps/qdeclarativepolylinemapitem.cpp6
-rw-r--r--src/location/declarativemaps/qdeclarativepolylinemapitem_p.h1
-rw-r--r--src/location/declarativemaps/qdeclarativerectanglemapitem.cpp6
-rw-r--r--src/location/declarativemaps/qdeclarativerectanglemapitem_p.h1
14 files changed, 34 insertions, 32 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 6df34ce9..204cf944 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,7 +1,7 @@
load(qt_build_config)
CONFIG += warning_clean
-MODULE_VERSION = 5.12.3
+MODULE_VERSION = 5.12.4
# Adds a way to debug location. The define is needed for multiple subprojects as they
# include the essential headers.
diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4
new file mode 100644
index 00000000..a285cd8e
--- /dev/null
+++ b/dist/changes-5.12.4
@@ -0,0 +1,20 @@
+Qt 5.12.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.3.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
index 2727cc26..b3496816 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
@@ -327,6 +327,7 @@ QDeclarativeCircleMapItem::QDeclarativeCircleMapItem(QQuickItem *parent)
: QDeclarativeGeoMapItemBase(parent), border_(this), color_(Qt::transparent), dirtyMaterial_(true),
updatingGeometry_(false)
{
+ m_itemType = QGeoMap::MapCircle;
setFlag(ItemHasContents, true);
QObject::connect(&border_, SIGNAL(colorChanged(QColor)),
this, SLOT(markSourceDirtyAndUpdate()));
@@ -624,11 +625,6 @@ void QDeclarativeCircleMapItem::setGeoShape(const QGeoShape &shape)
emit radiusChanged(circle_.radius());
}
-QGeoMap::ItemType QDeclarativeCircleMapItem::itemType() const
-{
- return QGeoMap::MapCircle;
-}
-
/*!
\internal
*/
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
index a5b92881..4b3f81c0 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
@@ -95,7 +95,6 @@ public:
bool contains(const QPointF &point) const override;
const QGeoShape &geoShape() const override;
void setGeoShape(const QGeoShape &shape) override;
- QGeoMap::ItemType itemType() const override;
static bool crossEarthPole(const QGeoCoordinate &center, qreal distance);
static void calculatePeripheralPoints(QList<QGeoCoordinate> &path, const QGeoCoordinate &center,
diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase.cpp b/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
index 7de6afb5..523655c0 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
@@ -281,6 +281,11 @@ QSGNode *QDeclarativeGeoMapItemBase::updateMapItemPaintNode(QSGNode *oldNode, Up
return 0;
}
+QGeoMap::ItemType QDeclarativeGeoMapItemBase::itemType() const
+{
+ return m_itemType;
+}
+
/*!
\internal
diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
index 4eff32db..23fd1da6 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
@@ -99,7 +99,7 @@ public:
QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
virtual QSGNode *updateMapItemPaintNode(QSGNode *, UpdatePaintNodeData *);
- virtual QGeoMap::ItemType itemType() const = 0;
+ QGeoMap::ItemType itemType() const;
qreal mapItemOpacity() const;
void setParentGroup(QDeclarativeGeoMapItemGroup &parentGroup);
@@ -119,6 +119,8 @@ protected:
bool childMouseEventFilter(QQuickItem *item, QEvent *event);
bool isPolishScheduled() const;
+ QGeoMap::ItemType m_itemType = QGeoMap::NoItem;
+
private Q_SLOTS:
void baseCameraDataChanged(const QGeoCameraData &camera);
void visibleAreaChanged();
diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp
index 5f9ecc8a..f7409788 100644
--- a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp
@@ -135,6 +135,7 @@ QDeclarativeGeoMapQuickItem::QDeclarativeGeoMapQuickItem(QQuickItem *parent)
: QDeclarativeGeoMapItemBase(parent), zoomLevel_(0.0),
mapAndSourceItemSet_(false), updatingGeometry_(false), matrix_(nullptr)
{
+ m_itemType = QGeoMap::MapQuickItem;
setFlag(ItemHasContents, true);
opacityContainer_ = new QQuickItem(this);
opacityContainer_->setParentItem(this);
@@ -362,11 +363,6 @@ void QDeclarativeGeoMapQuickItem::setGeoShape(const QGeoShape &shape)
}
-QGeoMap::ItemType QDeclarativeGeoMapQuickItem::itemType() const
-{
- return QGeoMap::MapQuickItem;
-}
-
/*!
\internal
*/
diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
index a27a0bce..2663fdc6 100644
--- a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
@@ -98,7 +98,6 @@ public:
const QGeoShape &geoShape() const override;
void setGeoShape(const QGeoShape &shape) override;
- QGeoMap::ItemType itemType() const override;
Q_SIGNALS:
void coordinateChanged();
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
index f4cdc6bf..734e03ff 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
@@ -318,6 +318,7 @@ QDeclarativePolygonMapItem::QDeclarativePolygonMapItem(QQuickItem *parent)
: QDeclarativeGeoMapItemBase(parent), border_(this), color_(Qt::transparent), dirtyMaterial_(true),
updatingGeometry_(false)
{
+ m_itemType = QGeoMap::MapPolygon;
setFlag(ItemHasContents, true);
QObject::connect(&border_, SIGNAL(colorChanged(QColor)),
this, SLOT(markSourceDirtyAndUpdate()));
@@ -619,11 +620,6 @@ void QDeclarativePolygonMapItem::setGeoShape(const QGeoShape &shape)
emit pathChanged();
}
-QGeoMap::ItemType QDeclarativePolygonMapItem::itemType() const
-{
- return QGeoMap::MapPolygon;
-}
-
/*!
\internal
*/
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
index 87d72307..810a8d35 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
@@ -108,7 +108,6 @@ public:
bool contains(const QPointF &point) const override;
const QGeoShape &geoShape() const override;
void setGeoShape(const QGeoShape &shape) override;
- QGeoMap::ItemType itemType() const override;
Q_SIGNALS:
void pathChanged();
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
index 2fb3098d..189e8273 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
@@ -738,6 +738,7 @@ bool QGeoMapPolylineGeometry::contains(const QPointF &point) const
QDeclarativePolylineMapItem::QDeclarativePolylineMapItem(QQuickItem *parent)
: QDeclarativeGeoMapItemBase(parent), line_(this), dirtyMaterial_(true), updatingGeometry_(false)
{
+ m_itemType = QGeoMap::MapPolyline;
setFlag(ItemHasContents, true);
QObject::connect(&line_, SIGNAL(colorChanged(QColor)),
this, SLOT(updateAfterLinePropertiesChanged()));
@@ -1149,11 +1150,6 @@ void QDeclarativePolylineMapItem::setGeoShape(const QGeoShape &shape)
emit pathChanged();
}
-QGeoMap::ItemType QDeclarativePolylineMapItem::itemType() const
-{
- return QGeoMap::MapPolyline;
-}
-
//////////////////////////////////////////////////////////////////////
/*!
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
index 1105bb13..3aa0f96b 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
@@ -156,7 +156,6 @@ public:
bool contains(const QPointF &point) const override;
const QGeoShape &geoShape() const override;
void setGeoShape(const QGeoShape &shape) override;
- QGeoMap::ItemType itemType() const override;
QDeclarativeMapLineProperties *line();
diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
index ba67ecad..74f95734 100644
--- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
@@ -118,6 +118,7 @@ QDeclarativeRectangleMapItem::QDeclarativeRectangleMapItem(QQuickItem *parent)
: QDeclarativeGeoMapItemBase(parent), border_(this), color_(Qt::transparent), dirtyMaterial_(true),
updatingGeometry_(false)
{
+ m_itemType = QGeoMap::MapRectangle;
setFlag(ItemHasContents, true);
QObject::connect(&border_, SIGNAL(colorChanged(QColor)),
this, SLOT(markSourceDirtyAndUpdate()));
@@ -370,11 +371,6 @@ void QDeclarativeRectangleMapItem::setGeoShape(const QGeoShape &shape)
emit bottomRightChanged(rectangle_.bottomRight());
}
-QGeoMap::ItemType QDeclarativeRectangleMapItem::itemType() const
-{
- return QGeoMap::MapRectangle;
-}
-
/*!
\internal
*/
diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
index e2ac2974..790b99d9 100644
--- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
@@ -91,7 +91,6 @@ public:
bool contains(const QPointF &point) const override;
const QGeoShape &geoShape() const override;
void setGeoShape(const QGeoShape &shape) override;
- QGeoMap::ItemType itemType() const override;
Q_SIGNALS:
void topLeftChanged(const QGeoCoordinate &topLeft);