diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-10-11 15:37:33 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-10-12 19:14:47 +0200 |
commit | a5f0361622eb08eab6c3474d5fc249d1962e3d1e (patch) | |
tree | d31cb21abbed8764fef2a31e6b85cf4655c3f5d8 /src/quick/items/qquickshadereffectsource_p.h | |
parent | 93ccc3ddf918156a8b967e66e6db3f6e1880bc17 (diff) |
Revert "Fix for possible crash in QSGDefaultLayer::grab"
This reverts commit 1c5de027d0c31d1d6697bd0557128d92207763d8.
The fix here is not correct. Calling a QSGRhiLayer function from the gui
thread is very wrong and can cause a set of unexpected issues. The
Address Sanitizer catches this by recognizing that the render thread is
trying to do something with an object destroyed in the meantime on the
main thread in the layer->setItem(null) call.
The issue the original fix is trying to address needs to be addressed in
some different form.
Fixes: QTBUG-94975
Pick-to: 6.2 6.1 5.15
Change-Id: I46f904026281201fc6d233ed7d3bdc7080934afe
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'src/quick/items/qquickshadereffectsource_p.h')
-rw-r--r-- | src/quick/items/qquickshadereffectsource_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h index 921038e49a..fe419e5959 100644 --- a/src/quick/items/qquickshadereffectsource_p.h +++ b/src/quick/items/qquickshadereffectsource_p.h @@ -174,7 +174,6 @@ Q_SIGNALS: private Q_SLOTS: void sourceItemDestroyed(QObject *item); void invalidateSceneGraph(); - void sourceItemParentChanged(QQuickItem *parent); protected: void releaseResources() override; |