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/plugins/geoservices/nokia/qgeocodereply_nokia.cpp | |
| 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/plugins/geoservices/nokia/qgeocodereply_nokia.cpp')
| -rw-r--r-- | src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp index 2b302a76..6e1d1270 100644 --- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp @@ -62,7 +62,7 @@ QGeoCodeReplyNokia::QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offs qRegisterMetaType<QList<QGeoLocation> >(); connect(reply, SIGNAL(finished()), this, SLOT(networkFinished())); - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), + connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(networkError(QNetworkReply::NetworkError))); connect(this, &QGeoCodeReply::aborted, reply, &QNetworkReply::abort); connect(this, &QGeoCodeReply::aborted, [this](){ m_parsing = false; }); @@ -83,7 +83,7 @@ void QGeoCodeReplyNokia::networkFinished() QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender()); reply->deleteLater(); - if (reply->networkError() != QNetworkReply::NoError) + if (reply->error() != QNetworkReply::NoError) return; QGeoCodeJsonParser *parser = new QGeoCodeJsonParser; // QRunnable, autoDelete = true. |