1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure paintGL() is called in tst_WaylandClient::glWindow()

Browse Source 
The test is still skipped due to CI problems, though (QTBUG-65802).

Task-number: QTBUG-66511
Change-Id: I79a67a80708de4cf2a7347a96c4b6344182d3ae0
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2018-02-28 13:26:48 +01:00 committed by David Edmundson
parent bb409e849b
commit 01d0594c9e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/wayland/client/tst_client.cpp
View File

@ -113,6 +113,7 @@ class TestGlWindow : public QOpenGLWindow
public: public:
TestGlWindow(); TestGlWindow();
uint paintGLCalled = 0;
protected: protected:
void paintGL() override; void paintGL() override;
@ -124,6 +125,7 @@ TestGlWindow::TestGlWindow()
void TestGlWindow::paintGL() void TestGlWindow::paintGL()
{ {
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
++paintGLCalled;
} }
class tst_WaylandClient : public QObject class tst_WaylandClient : public QObject
@ -550,6 +552,8 @@ void tst_WaylandClient::glWindow()
QSharedPointer<MockSurface> surface; QSharedPointer<MockSurface> surface;
QTRY_VERIFY(surface = compositor->surface()); QTRY_VERIFY(surface = compositor->surface());
QTRY_VERIFY(testWindow->paintGLCalled);
//confirm we don't crash when we delete an already hidden GL window //confirm we don't crash when we delete an already hidden GL window
//QTBUG-65553 //QTBUG-65553
testWindow->setVisible(false); testWindow->setVisible(false);