diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-01-11 16:02:14 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-01-13 23:03:47 +0100 |
| commit | f1d2a49c747e69938f9f878f64620d7d6fc61b41 (patch) | |
| tree | a3e7b6f49039009fc1816f5d0b54218523c23850 /src/location/declarativemaps/qdeclarativepolylinemapitem_p.h | |
| parent | 861e372b6ad81570d4f496e42fb25a6699b72f2f (diff) | |
| download | qtlocation-f1d2a49c747e69938f9f878f64620d7d6fc61b41.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.
Fixes: QTBUG-88017
Change-Id: I53c5da915981bd05f39134ba57f585d0a0786aa8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/declarativemaps/qdeclarativepolylinemapitem_p.h')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativepolylinemapitem_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h index 9cd20ea5..d3d0ebd6 100644 --- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h +++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h @@ -97,8 +97,10 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItem : public QDeclarativ public: enum Backend { Software = 0, +#if QT_CONFIG(opengl) OpenGLLineStrip = 1, OpenGLExtruded = 2, +#endif }; explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0); |