diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-08 14:16:51 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-08 14:16:51 +0200 |
commit | 2349ba61a8b379906f733e893f4f5e5c08c1cf24 (patch) | |
tree | 05e03f658a19656bf5ee8628a06dec83142ffec2 /tests/auto/render/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp | |
parent | bb0f4b48390b5ddc9758f04f6ecd692072fb279f (diff) | |
parent | 4a2d8d6ee54976e3a8e2218bc8e97c857688cdfe (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.9.0
Conflicts:
src/render/geometry/buffer.cpp
Change-Id: If4d28a1e4c95cbd8e81b1751eed3214952516d8c
Diffstat (limited to 'tests/auto/render/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp')
-rw-r--r-- | tests/auto/render/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/render/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp b/tests/auto/render/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp index cdca5676b..b7cc1cdac 100644 --- a/tests/auto/render/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp +++ b/tests/auto/render/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp @@ -176,7 +176,7 @@ class tst_GraphicsHelperGL3_3 : public QObject Q_OBJECT private Q_SLOTS: - void initTestCase() + void init() { m_window.reset(new QWindow); m_window->setSurfaceType(QWindow::OpenGLSurface); @@ -209,7 +209,7 @@ private Q_SLOTS: } } - void cleanupTestCase() + void cleanup() { m_glContext.doneCurrent(); } |