diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-27 10:37:35 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-30 06:51:15 +0000 |
| commit | a4b307499337e724c4e338a587d665e0f5ad52d3 (patch) | |
| tree | 423183a1675978bfad47cd518f95131f4e6e2fff /src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h | |
| parent | c8316825b9961bbf1c5677c192c708bef2ef7e06 (diff) | |
| download | qtlocation-a4b307499337e724c4e338a587d665e0f5ad52d3.tar.gz | |
Avoid symbol clash between here and osm plugin
This is of relevance for static Qt builds
Task-number: QTBUG-43681
Task-number: QTBUG-45214
Change-Id: Iea9b4a7cad055dc47265bb51fe2654af80e356b7
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h')
| -rw-r--r-- | src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h index caca8d24..fe2e537e 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QPlaceContentReply; class QNetworkReply; class QNetworkAccessManager; -class QPlaceCategoriesReplyImpl; +class QPlaceCategoriesReplyHere; class QGeoNetworkAccessManager; class QGeoUriProvider; @@ -119,7 +119,7 @@ private: QPlaceCategoryTree m_tempTree; QHash<QString, QString> m_restIdToIconHash; - QPointer<QPlaceCategoriesReplyImpl> m_categoryReply; + QPointer<QPlaceCategoriesReplyHere> m_categoryReply; QHash<QString, QNetworkReply *> m_categoryRequests; QString m_appId; |