summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3d/items/quick3dbuffer.cpp
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-04-27 11:56:17 +0100
committerPaul Lemire <paul.lemire@kdab.com>2020-05-06 15:29:54 +0200
commit764924da8ab3255c1b8d1ad5b39f85675f4b855e (patch)
treec7b3e9d94318fd347ef2717feb5b539f5c18ff13 /src/quick3d/quick3d/items/quick3dbuffer.cpp
parent9838d91e2d433f13c57bdae48e31ba0b909988aa (diff)
Fix build for Qt6
- updated dependencies, excluding qtgamepad for now - fixed issues with Q_PROPERTY not supporting forward declarations - fixed for changes in QtQuick private API - fixed for changes in QtOpenGLVersionFunctions API - fixed for removal of QT_OPENGL_ES* macros - fixed for changes in QtConcurrent API - fixed RHI based build Change-Id: I42ccd2f101b7f0a78e2860c6d551722bf6710a11 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/quick3d/items/quick3dbuffer.cpp')
-rw-r--r--src/quick3d/quick3d/items/quick3dbuffer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/quick3d/items/quick3dbuffer.cpp b/src/quick3d/quick3d/items/quick3dbuffer.cpp
index 7beb1cc90..dd2c4dca4 100644
--- a/src/quick3d/quick3d/items/quick3dbuffer.cpp
+++ b/src/quick3d/quick3d/items/quick3dbuffer.cpp
@@ -71,7 +71,7 @@ QByteArray Quick3DBuffer::convertToRawData(const QJSValue &jsValue)
Q_ASSERT(m_v4engine);
QV4::Scope scope(m_v4engine);
QV4::Scoped<QV4::TypedArray> typedArray(scope,
- QJSValuePrivate::convertedToValue(m_v4engine, jsValue));
+ QJSValuePrivate::convertToReturnedValue(m_v4engine, jsValue));
if (!typedArray)
return QByteArray();