diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-03-23 14:37:18 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-28 12:54:25 +0000 |
| commit | b1301c298f3e2ae356f7ada7bea731a4f4d4dbc3 (patch) | |
| tree | c84ea39ea1ad165151d4179683175b8e115d1949 /src/render/backend/platformsurfacefilter_p.h | |
| parent | e22c9c5029f5dfac78bd530cfff806a085430a03 (diff) | |
Fix more QSurface vs QObject wrangling
Qt 3D is now able to render again.
Change-Id: I588da23eeb6d8760f26014c2d7e5ea4ca45eefec
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/platformsurfacefilter_p.h')
| -rw-r--r-- | src/render/backend/platformsurfacefilter_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/render/backend/platformsurfacefilter_p.h b/src/render/backend/platformsurfacefilter_p.h index 92d54916c..e95c45d67 100644 --- a/src/render/backend/platformsurfacefilter_p.h +++ b/src/render/backend/platformsurfacefilter_p.h @@ -82,13 +82,15 @@ public: template<class T> void setSurface(T *surface) { + Q_ASSERT(surface); if (m_obj == surface) return; if (m_obj) m_obj->removeEventFilter(this); - m_surface = surface; + // Surface is offset from QWindow/QOffscreenSurface due to multiple inheritance + m_surface = static_cast<QSurface *>(surface); m_obj = surface; if (m_obj) { |