diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 05:13:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 05:13:42 (GMT) |
| commit | c791b300b288635ed018d50c5e6e28859b374b5e (patch) | |
| tree | d2e1c82246fd860a82062bd11df06d4d984fc9e9 /src/opengl | |
| parent | 8a986d6fc4f0b87eda4f4f364cac6b39bbce5896 (diff) | |
| parent | 9615608afa7e0a62d1a444b699f40aeeaeaf41de (diff) | |
| download | Qt-c791b300b288635ed018d50c5e6e28859b374b5e.zip Qt-c791b300b288635ed018d50c5e6e28859b374b5e.tar.gz Qt-c791b300b288635ed018d50c5e6e28859b374b5e.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:
Fix opening a network session multiple times in succession.
Fix synchronous dispatch in ICD in non-main threads.
Russian translation update
QNAM HTTP: Download last chunk properly when readBufferSize() limited
Prevent access to non-existent memory in QGL2PEXVertexArray
Prevent excessive seeks in xbm detection
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp b/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp index 559a6fd..167a7d2 100644 --- a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp +++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp @@ -63,8 +63,9 @@ QGLRect QGL2PEXVertexArray::boundingRect() const void QGL2PEXVertexArray::addClosingLine(int index) { - if (QPointF(vertexArray.at(index)) != QPointF(vertexArray.last())) - vertexArray.add(vertexArray.at(index)); + QPointF point(vertexArray.at(index)); + if (point != QPointF(vertexArray.last())) + vertexArray.add(point); } void QGL2PEXVertexArray::addCentroid(const QVectorPath &path, int subPathIndex) |