diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-31 03:03:41 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2020-04-02 08:20:37 +0200 |
commit | b06a07cf9fd474e11fbe467047e5fe0322b677f0 (patch) | |
tree | ba8b1dd84c3d263b27a1865fff84a659b5273091 /src/location/declarativemaps/qdeclarativegeomapitemutils_p.h | |
parent | 4cfed13377ababcfaa7dacb055bcd3dd0f2cf7d4 (diff) | |
parent | 29816a3aaa3f368422a3b19983add62673bb6960 (diff) | |
download | qtlocation-b06a07cf9fd474e11fbe467047e5fe0322b677f0.tar.gz |
Merge 5.15 to dev and fix resulting compile issues
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
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomapitemutils_p.h')
-rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapitemutils_p.h | 122 |
1 files changed, 122 insertions, 0 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemutils_p.h b/src/location/declarativemaps/qdeclarativegeomapitemutils_p.h new file mode 100644 index 00000000..48ece6b2 --- /dev/null +++ b/src/location/declarativemaps/qdeclarativegeomapitemutils_p.h @@ -0,0 +1,122 @@ +/**************************************************************************** +** +** Copyright (C) 2020 Paolo Angelelli <paolo.angelelli@gmail.com> +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtLocation module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QDECLARATIVEGEOMAPITEMUTILS_P_H +#define QDECLARATIVEGEOMAPITEMUTILS_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtLocation/private/qlocationglobal_p.h> +#include <QtLocation/private/qgeoprojection_p.h> +#include <QtPositioning/private/qdoublevector2d_p.h> + + +QT_BEGIN_NAMESPACE + +class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapItemUtils +{ +public: + struct vec2 { + float x; + float y; + vec2(const QDoubleVector2D &p) + { + x = float(p.x()); + y = float(p.y()); + } + vec2() = default; + vec2 &operator=(const QPointF &p) + { + x = float(p.x()); + y = float(p.y()); + return *this; + } + vec2 &operator=(const QDoubleVector2D &p) + { + x = float(p.x()); + y = float(p.y()); + return *this; + } + QDoubleVector2D toDoubleVector2D() const + { + return QDoubleVector2D(double(x), double(y)); + } + }; + + static void wrapPath(const QList<QGeoCoordinate> &perimeter + ,const QGeoCoordinate &geoLeftBound + ,const QGeoProjectionWebMercator &p + ,QList<QDoubleVector2D> &wrappedPath + ,QList<QDoubleVector2D> &wrappedPathMinus1 + ,QList<QDoubleVector2D> &wrappedPathPlus1 + ,QDoubleVector2D *leftBoundWrapped = nullptr); + + static void wrapPath(const QList<QGeoCoordinate> &perimeter + ,const QGeoCoordinate &geoLeftBound + ,const QGeoProjectionWebMercator &p + ,QList<QDoubleVector2D> &wrappedPath + ,QDoubleVector2D *leftBoundWrapped = nullptr); + + static void wrapPath(const QList<QDoubleVector2D> &path + , const QDoubleVector2D &geoLeftBound + , QList<QDoubleVector2D> &wrappedPath); + + + static void clipPolygon(const QList<QDoubleVector2D> &wrappedPath + ,const QGeoProjectionWebMercator &p + ,QList<QList<QDoubleVector2D> > &clippedPaths + ,QDoubleVector2D *leftBoundWrapped = nullptr + ,const bool closed = true); + + static void projectBbox(const QList<QDoubleVector2D> &clippedBbox + ,const QGeoProjectionWebMercator &p + ,QPainterPath &projectedBbox); + +}; + +QT_END_NAMESPACE + +#endif // QDECLARATIVEGEOMAPITEMUTILS_P_H |