diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-01-11 16:02:14 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-03-25 11:08:33 +0100 |
| commit | 4bcacd0dc8f73de7b9e5e5f5fa2129fd88bdff3b (patch) | |
| tree | c257958bf7892f83fa6a80331c53c8292293b2f2 /src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h | |
| parent | 4d6e3ba98a09ffb390da90154a2f61085b565d8e (diff) | |
| download | qtlocation-4bcacd0dc8f73de7b9e5e5f5fa2129fd88bdff3b.tar.gz | |
Fix compilation for no opengl builds
Disables experimental labs qml plugin, which
since a4469cad40 depends heavily on opengl backend.
Fix warnings with msvc when compiling without experimental
plugin.
Task-number: QTBUG-91623
Fixes: QTBUG-88017
Change-Id: I53c5da915981bd05f39134ba57f585d0a0786aa8
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h index 705ccf5a..eecd8402 100644 --- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h +++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h @@ -213,6 +213,7 @@ protected: QSGGeometry geometry_; }; +#if QT_CONFIG(opengl) class Q_LOCATION_PRIVATE_EXPORT QGeoMapItemLODGeometry { public: @@ -567,6 +568,7 @@ protected: MapPolylineMaterialExtruded fill_material_; QSGGeometry m_geometryTriangulating; }; +#endif // QT_CONFIG(opengl) class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivate { @@ -721,6 +723,7 @@ public: MapPolylineNode *m_node = nullptr; }; +#if QT_CONFIG(opengl) class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivateOpenGLLineStrip: public QDeclarativePolylineMapItemPrivate { public: @@ -885,7 +888,7 @@ public: MapPolylineNodeOpenGLExtruded *m_nodeTri = nullptr; }; - +#endif // QT_CONFIG(opengl) QT_END_NAMESPACE #endif // QDECLARATIVEPOLYLINEMAPITEM_P_P_H |