Fix gcc compilation problems in QtOpenGL. Actually was typo and

for some reason rvct didn't catch that.

Reviewed-by: TRUSTME

2 files changed, 7 insertions, 2 deletions

diff --git a/src/opengl/gl2paintengineex/qtriangulator.cpp b/src/opengl/gl2paintengineex/qtriangulator.cpp
index ea072b4..bf21240 100644
--- a/src/opengl/gl2paintengineex/qtriangulator.cpp
+++ b/src/opengl/gl2paintengineex/qtriangulator.cpp
@@ -2025,7 +2025,7 @@ void QTriangulator<T>::ComplexToSimple::fillPriorityQueue()
         Q_ASSERT(m_edges.at(i).previous == -1 && m_edges.at(i).next == -1);
         Q_ASSERT(m_edges.at(i).node == 0);
         Q_ASSERT(m_edges.at(i).pointingUp == m_edges.at(i).originallyPointingUp);
-        Q_ASSERT(m_edges.at(i).pointingUp == (m_parent->m_vertices.at(qint32)(m_edges.at(i).to) < m_parent->m_vertices.at(m_edges.at(i).from)));
+        Q_ASSERT(m_edges.at(i).pointingUp == (m_parent->m_vertices.at(m_edges.at(i).to) < m_parent->m_vertices.at(m_edges.at(i).from)));
         // Ignore zero-length edges.
         if (m_parent->m_vertices.at(m_edges.at(i).to) != m_parent->m_vertices.at(m_edges.at(i).from)) {
             QPodPoint upper = m_parent->m_vertices.at(m_edges.at(i).upper());
@@ -2214,7 +2214,7 @@ void QTriangulator<T>::ComplexToSimple::removeUnwantedEdgesAndConnect()
             while (current != b.second) {
                 Q_ASSERT(current);
                 Q_ASSERT(m_edges.at(current->data).node == current);
-                Q_ASSERT(qIntersectionPoint(event.point).isOnLine(m_parent->m_vertices.at(m_edges.at(current->data).from), m_parent->m_vertices.at(qint32)(m_edges.at(current->data).to)));
+                Q_ASSERT(qIntersectionPoint(event.point).isOnLine(m_parent->m_vertices.at(m_edges.at(current->data).from), m_parent->m_vertices.at(m_edges.at(current->data).to)));
                 Q_ASSERT(m_parent->m_vertices.at(m_edges.at(current->data).from) == event.point || m_parent->m_vertices.at(m_edges.at(current->data).to) == event.point);
                 insertEdgeIntoVectorIfWanted(orderedEdges, current->data);
                 current = m_edgeList.next(current);
diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/qglthreads/tst_qglthreads.cpp
index cce3161..06131bd 100644
--- a/tests/auto/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/qglthreads/tst_qglthreads.cpp
@@ -49,6 +49,10 @@
 #include <private/qt_x11_p.h>
 #endif
 
+#ifdef Q_OS_SYMBIAN
+#include <unistd.h> // for usleep
+#endif
+
 #define RUNNING_TIME 5000
 
 tst_QGLThreads::tst_QGLThreads(QObject *parent)
@@ -209,6 +213,7 @@ public:
             p.drawText(image.rect(), Qt::AlignCenter, "This is an autotest");
             p.end();
             m_gl->bindTexture(image, GL_TEXTURE_2D, GL_RGBA, QGLContext::InternalBindOption);
+
             createdAndUploaded(image);
         }
     }