diff options
| author | Tuomo Pelkonen <tuomo.pelkonen@gmail.com> | 2021-01-18 19:03:07 +0200 |
|---|---|---|
| committer | Tuomo Pelkonen <tuomo.pelkonen@gmail.com> | 2021-01-27 10:12:02 +0200 |
| commit | ff193e33d80a08ca0c21fdbccc2d63e6b7400d88 (patch) | |
| tree | b47fd1b52d76356c9e0359b347cdb96edb7795d4 /src/datavisualization/utils/qutils.h | |
| parent | 18a562554e9050f0d8b4896237dc0fb306f6a704 (diff) | |
Fix compilation issues for macOS and Android on Qt 6.0
Task-number: QTBUG-89297
Change-Id: I57acf345b6fc64a93d08d41016c755cae4edd6db
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/datavisualization/utils/qutils.h')
| -rw-r--r-- | src/datavisualization/utils/qutils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h index b7001652..65fb8047 100644 --- a/src/datavisualization/utils/qutils.h +++ b/src/datavisualization/utils/qutils.h @@ -39,7 +39,7 @@ namespace QtDataVisualization { #ifndef Q_QDOC -static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true) Q_DECL_UNUSED; +static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true); #endif static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias) { @@ -65,7 +65,7 @@ static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias) ctx->makeCurrent(dummySurface); } -#if defined(QT_OPENGL_ES_2) +#if QT_CONFIG(opengles2) isES = true; #elif (QT_VERSION < QT_VERSION_CHECK(5, 3, 0)) isES = false; |