Skip to content

Commit

Permalink
change nullptr to a int ptr for qt 5.15.2 bug (#527)
Browse files Browse the repository at this point in the history
See: https://bugreports.qt.io/browse/QTBUG-89114
Signed-off-by: acxz <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
acxz and chapulina committed Mar 10, 2021
1 parent 23b5406 commit 84c4ce9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/gui/plugins/scene3d/Scene3D.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 84c4ce9

Please sign in to comment.