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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml | 2 | ||||
| -rw-r--r-- | examples/datavisualization/volumetric/volumetric.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml b/examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml index ab976995..5673e1aa 100644 --- a/examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml +++ b/examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml @@ -28,6 +28,8 @@ ****************************************************************************/ import QtQuick +import QtQml +import QtQml.Models Item { property alias model: dataModel diff --git a/examples/datavisualization/volumetric/volumetric.cpp b/examples/datavisualization/volumetric/volumetric.cpp index 781081d1..f9d457f1 100644 --- a/examples/datavisualization/volumetric/volumetric.cpp +++ b/examples/datavisualization/volumetric/volumetric.cpp @@ -67,7 +67,7 @@ const int terrainTransparency(12); static bool isOpenGLES() { -#if defined(QT_OPENGL_ES_2) +#if QT_CONFIG(opengles2) return true; #elif (QT_VERSION < QT_VERSION_CHECK(5, 3, 0)) return false; |