summaryrefslogtreecommitdiffstats
path: root/tests/auto/opengl
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/opengl')
-rw-r--r--tests/auto/opengl/qgl/qgl.pro1
-rw-r--r--tests/auto/opengl/qglthreads/tst_qglthreads.cpp12
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/auto/opengl/qgl/qgl.pro b/tests/auto/opengl/qgl/qgl.pro
index 311e41a624..35b5c6888b 100644
--- a/tests/auto/opengl/qgl/qgl.pro
+++ b/tests/auto/opengl/qgl/qgl.pro
@@ -12,3 +12,4 @@ 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/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
index c74edab9a2..f5923764b8 100644
--- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
@@ -346,12 +346,12 @@ void renderAScene(int w, int h)
for (int i=0; i<1000; ++i) {
GLfloat pos[] = {
- (rand() % 100) / 100.,
- (rand() % 100) / 100.,
- (rand() % 100) / 100.,
- (rand() % 100) / 100.,
- (rand() % 100) / 100.,
- (rand() % 100) / 100.
+ (rand() % 100) / 100.f,
+ (rand() % 100) / 100.f,
+ (rand() % 100) / 100.f,
+ (rand() % 100) / 100.f,
+ (rand() % 100) / 100.f,
+ (rand() % 100) / 100.f
};
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, pos);