diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-10 12:54:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-10 12:54:13 (GMT) |
| commit | 3efaed62e11e9e461f7244a99a233140b9f28510 (patch) | |
| tree | 4a3934bd13a7a3da89c4710a987914b6a15a0968 /src | |
| parent | f07d637dfe39a3887c1c2374f0543e19d885ff90 (diff) | |
| parent | b9664d5aecc05f63ef705962f4d92155fb0ce0bf (diff) | |
| download | Qt-3efaed62e11e9e461f7244a99a233140b9f28510.zip Qt-3efaed62e11e9e461f7244a99a233140b9f28510.tar.gz Qt-3efaed62e11e9e461f7244a99a233140b9f28510.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixing OpenGL module build error on Solaris
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtriangulator.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qtriangulator.cpp b/src/opengl/gl2paintengineex/qtriangulator.cpp index 7c3be2b..5293eff 100644 --- a/src/opengl/gl2paintengineex/qtriangulator.cpp +++ b/src/opengl/gl2paintengineex/qtriangulator.cpp @@ -1309,6 +1309,9 @@ inline void QRingBuffer<T>::enqueue(const T &x) //============================================================================// // QTriangulator // //============================================================================// + +typedef QRBTree<int>::Node *QRBTreeIntNodePointer; + template<typename T> class QTriangulator { @@ -1775,7 +1778,7 @@ bool QTriangulator<T>::ComplexToSimple::edgeIsLeftOfEdge(int leftEdgeIndex, int } template <typename T> -QRBTree<int>::Node *QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex) const +QRBTreeIntNodePointer QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex) const { QRBTree<int>::Node *current = m_edgeList.root; QRBTree<int>::Node *result = 0; @@ -1791,7 +1794,7 @@ QRBTree<int>::Node *QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edge } template <typename T> -QRBTree<int>::Node *QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex, QRBTree<int>::Node *after) const +QRBTreeIntNodePointer QTriangulator<T>::ComplexToSimple::searchEdgeLeftOf(int edgeIndex, QRBTree<int>::Node *after) const { if (!m_edgeList.root) return after; |