From 84c4ce9f9a230c27972a56f489cd1e8d250aeef5 Mon Sep 17 00:00:00 2001 From: Akash Patel <17132214+acxz@users.noreply.github.com> Date: Thu, 7 Jan 2021 14:01:53 -0500 Subject: [PATCH] change nullptr to a int ptr for qt 5.15.2 bug (#527) See: https://bugreports.qt.io/browse/QTBUG-89114 Signed-off-by: acxz <17132214+acxz@users.noreply.github.com> Co-authored-by: Louise Poubel Signed-off-by: Louise Poubel --- src/gui/plugins/scene3d/Scene3D.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/plugins/scene3d/Scene3D.cc b/src/gui/plugins/scene3d/Scene3D.cc index 4f7730d67b..289cf9de0b 100644 --- a/src/gui/plugins/scene3d/Scene3D.cc +++ b/src/gui/plugins/scene3d/Scene3D.cc @@ -2181,8 +2181,9 @@ TextureNode::TextureNode(QQuickWindow *_window) #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) this->texture = this->window->createTextureFromId(0, QSize(1, 1)); #else + void * nativeLayout; this->texture = this->window->createTextureFromNativeObject( - QQuickWindow::NativeObjectTexture, nullptr, 0, QSize(1, 1), + QQuickWindow::NativeObjectTexture, &nativeLayout, 0, QSize(1, 1), QQuickWindow::TextureIsOpaque); #endif this->setTexture(this->texture);