summaryrefslogtreecommitdiffstats
path: root/tests/auto/opengl
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/opengl')
-rw-r--r--tests/auto/opengl/qgl/BLACKLIST1
-rw-r--r--tests/auto/opengl/qglthreads/tst_qglthreads.cpp7
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/opengl/qgl/BLACKLIST b/tests/auto/opengl/qgl/BLACKLIST
index 71be4bf19d..1eb0197484 100644
--- a/tests/auto/opengl/qgl/BLACKLIST
+++ b/tests/auto/opengl/qgl/BLACKLIST
@@ -19,6 +19,7 @@ winrt
[graphicsViewClipping]
windows
winrt
+rhel-7.4 ci
[glFBOUseInGLWidget]
windows
winrt
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
index 76186f5575..09bea20d26 100644
--- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
@@ -131,6 +131,13 @@ public:
setAutoBufferSwap(false);
}
+ void resizeEvent(QResizeEvent *e)
+ {
+ m_thread->lock();
+ QGLWidget::resizeEvent(e);
+ m_thread->unlock();
+ }
+
void paintEvent(QPaintEvent *)
{
m_thread->lock();