diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2020-06-09 11:31:58 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-11 22:23:46 +0200 |
| commit | 66056aba7b47c147b4cf9fd70a855dd15b8a9eb6 (patch) | |
| tree | 91dc8d5e96d49abdc84d913d4b83725e04e88d26 /src/quick/items/context2d/qquickcanvasitem.cpp | |
| parent | 212c2bffbb041aee0e3c9a7f0551ef151ed2d3ad (diff) | |
Remove FBO path from painternode/context2d
Task-number: QTBUG-84623
Change-Id: Icef7ab7460799b989f4e122be3f8d5cab98382e4
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quick/items/context2d/qquickcanvasitem.cpp')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 84f65d5241..9ee0dbba04 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -827,14 +827,14 @@ QSGTextureProvider *QQuickCanvasItem::textureProvider() const return QQuickItem::textureProvider(); Q_D(const QQuickCanvasItem); -#if QT_CONFIG(opengl) + QQuickWindow *w = window(); if (!w || !w->isSceneGraphInitialized() || QThread::currentThread() != QQuickWindowPrivate::get(w)->context->thread()) { qWarning("QQuickCanvasItem::textureProvider: can only be queried on the rendering thread of an exposed window"); return nullptr; } -#endif + if (!d->textureProvider) d->textureProvider = new QQuickCanvasTextureProvider; d->textureProvider->tex = d->nodeTexture; |