diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-28 16:28:29 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-28 16:28:29 +0100 |
commit | 91fc86bef3b9eb9467f6ac251d1953483da93185 (patch) | |
tree | 616f5dd534f4ddc86675047bac4eb3f4287085d1 /src/core/content_browser_client_qt.cpp | |
parent | 51228eb249a178ada6ebd2ccd5e662bcd7bd2c60 (diff) | |
parent | 556576b55f6b4404c71c74a5ef8e21f87ed09854 (diff) |
Merge remote-tracking branch 'origin/5.13.2' into 5.13
Change-Id: I5c95819f139bb0995475324bd33dab478802db59
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 04a8fc363..6d1bf07a9 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -196,7 +196,7 @@ public: void* GetHandle() override { return m_handle; } // Qt currently never creates contexts using robustness attributes. - bool WasAllocatedUsingRobustnessExtension() override { return false; } + unsigned int CheckStickyGraphicsResetStatus() override { return 0 /*GL_NO_ERROR*/; } // We don't care about the rest, this context shouldn't be used except for its handle. bool Initialize(gl::GLSurface *, const gl::GLContextAttribs &) override { Q_UNREACHABLE(); return false; } |