diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-29 00:26:26 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-29 06:52:09 +0200 |
| commit | 43dde53b5b0dfae14bf0bde97bf4709344131acd (patch) | |
| tree | e09596ef1720c40bc7e7a576f64bbb4ae957b380 /src/plugins | |
| parent | 46c9adfd30636a4b13f5b66bbe019e51033a5f0b (diff) | |
| download | qtlocation-43dde53b5b0dfae14bf0bde97bf4709344131acd.tar.gz | |
More include cleanup
Remove includes of private headers from other modules where possible.
Get rid of some duplicate includes, and try to group includes by module,
with private includes in a separate block for better visibility where we
have dependencies to private APIs.
Pick-to: 6.2
Change-Id: Ia6419bee2a2c50463dcc515f3f1590a749dfabc1
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/plugins')
3 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp index e2a56611..51450fd5 100644 --- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp +++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp @@ -56,7 +56,6 @@ #include <QtLocation/private/qgeoprojection_p.h> #include <QtQuick/QQuickWindow> #include <QtQuick/QSGImageNode> -#include <QtQuick/private/qsgtexture_p.h> #include <QtQuick/private/qsgcontext_p.h> // for debugging the context name #include <QMapboxGL> diff --git a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h index 02fae833..d0b69140 100644 --- a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h +++ b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h @@ -44,7 +44,6 @@ #include <QtQuick/QQuickWindow> #include <QtQuick/QSGRenderNode> #include <QtQuick/QSGSimpleTextureNode> -#include <QtQuick/private/qsgtexture_p.h> #include <QtOpenGL/QOpenGLFramebufferObject> #include <QMapboxGL> diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp index 80fe533e..831aad02 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp @@ -37,7 +37,6 @@ ** ****************************************************************************/ -#include <QtPositioning/private/qwebmercator_p.h> #include "qgeocameracapabilities_p.h" #include "qgeotiledmappingmanagerengine_nokia.h" #include "qgeotiledmap_nokia.h" @@ -54,6 +53,8 @@ #include <QtCore/qmath.h> #include <QtCore/qstandardpaths.h> +#include <QtPositioning/private/qwebmercator_p.h> + QT_BEGIN_NAMESPACE QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia( |