5 files changed, 10 insertions, 12 deletions
diff --git a/tests/auto/opengl/qgl/qgl.pro b/tests/auto/opengl/qgl/qgl.pro
index 35b5c6888b..af930c5be7 100644
--- a/tests/auto/opengl/qgl/qgl.pro
+++ b/tests/auto/opengl/qgl/qgl.pro
@@ -9,7 +9,3 @@ QT += widgets widgets-private opengl-private gui-private core-private testlib
 
 SOURCES   += tst_qgl.cpp
 RESOURCES  = qgl.qrc
-
-linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = lucid ]"): CONFIG+=insignificant_test # QTBUG-25293
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
-win32-msvc2010:contains(QT_CONFIG, angle):CONFIG += insignificant_test # QTQAINFRA-711
diff --git a/tests/auto/opengl/qglbuffer/qglbuffer.pro b/tests/auto/opengl/qglbuffer/qglbuffer.pro
index 72117322da..f12a191f79 100644
--- a/tests/auto/opengl/qglbuffer/qglbuffer.pro
+++ b/tests/auto/opengl/qglbuffer/qglbuffer.pro
@@ -3,10 +3,8 @@
 ############################################################
 
 CONFIG += testcase
-CONFIG += parallel_test
 TARGET = tst_qglbuffer
 requires(qtHaveModule(opengl))
 QT += opengl widgets testlib
 
 SOURCES += tst_qglbuffer.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/opengl/qglfunctions/qglfunctions.pro b/tests/auto/opengl/qglfunctions/qglfunctions.pro
index a512ea0dd9..9b349eaf34 100644
--- a/tests/auto/opengl/qglfunctions/qglfunctions.pro
+++ b/tests/auto/opengl/qglfunctions/qglfunctions.pro
@@ -1,10 +1,6 @@
 CONFIG += testcase
-CONFIG += parallel_test
 TARGET = tst_qglfunctions
 requires(qtHaveModule(opengl))
 QT += opengl widgets testlib
 
 SOURCES += tst_qglfunctions.cpp
-
-win32:CONFIG+=insignificant_test # QTBUG-26390
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/opengl/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro
index 3502c41c87..ab8bda741e 100644
--- a/tests/auto/opengl/qglthreads/qglthreads.pro
+++ b/tests/auto/opengl/qglthreads/qglthreads.pro
@@ -10,6 +10,5 @@ x11 {
     LIBS += $$QMAKE_LIBS_X11
 }
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 
-win32:CONFIG+=insignificant_test # QTBUG-28264
+
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
index 6a726ac62d..1dafa2779c 100644
--- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
@@ -702,6 +702,9 @@ private:
 */
 void tst_QGLThreads::painterOnGLWidgetInThread()
 {
+    //QTBUG-46446 tst_qglthreads is unstable on windows 7
+    if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
+        QSKIP("Doesn't work on this platform. QTBUG-46446");
     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
         QSKIP("No platformsupport for ThreadedOpenGL");
     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
@@ -746,6 +749,9 @@ void tst_QGLThreads::painterOnPixmapInThread()
 */
 void tst_QGLThreads::painterOnPboInThread()
 {
+    //QTBUG-46446 tst_qglthreads is unstable on windows 7
+    if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
+        QSKIP("Doesn't work on this platform. QTBUG-46446");
     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
         QSKIP("No platformsupport for ThreadedOpenGL");
     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
@@ -773,6 +779,9 @@ void tst_QGLThreads::painterOnPboInThread()
 */
 void tst_QGLThreads::painterOnFboInThread()
 {
+    //QTBUG-46446 tst_qglthreads is unstable on windows 7
+    if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
+        QSKIP("Doesn't work on this platform. QTBUG-46446");
     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
         QSKIP("No platformsupport for ThreadedOpenGL");
     if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||