From ff193e33d80a08ca0c21fdbccc2d63e6b7400d88 Mon Sep 17 00:00:00 2001 From: Tuomo Pelkonen Date: Mon, 18 Jan 2021 19:03:07 +0200 Subject: Fix compilation issues for macOS and Android on Qt 6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-89297 Change-Id: I57acf345b6fc64a93d08d41016c755cae4edd6db Reviewed-by: Tomi Korpipää --- examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml | 2 ++ examples/datavisualization/volumetric/volumetric.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'examples') 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; -- cgit v1.2.3