diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 04:39:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 04:39:18 (GMT) |
| commit | 8a2ae5245787cbfbeaf82c8f296da4d5a404db40 (patch) | |
| tree | 69b11ade9c8e3476b91200c7e375a4894158dee7 /src/opengl | |
| parent | 96e0af6be46e51dd3445cfbf23c09833c97c9f2c (diff) | |
| parent | d3a6103783b161d6d35a00cb50fef50e73b6a4b6 (diff) | |
| download | Qt-8a2ae5245787cbfbeaf82c8f296da4d5a404db40.zip Qt-8a2ae5245787cbfbeaf82c8f296da4d5a404db40.tar.gz Qt-8a2ae5245787cbfbeaf82c8f296da4d5a404db40.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:
remove pointless assignment of deprecated variable
fix tst_headers
Fixed a shell syntax error in configure
Clear X11 structure before use
Make operator QRectF const
Fix GC-related crash in QScriptValue::setData()
get rid of dependency on QtGui
Removed implicity QtGui linking from icd.pro as it is not needed.
DFB: Make sure QPixmap::hasAlpha is respected
fix build on mingw
Fix some painting issues in QDirectFBPaintEngine
QNAM: Do not need QNetworkSession in AlwaysCache load mode
Don't crash if QScriptClass property getter returns an invalid value
QNAM: Remove dead waitForUpstreamBytesWritten() code
QNAM: Remove dead waitForDownstreamReadyRead() code
fix memleak in test
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h index 46029b9..b8c1018 100644 --- a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h +++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h @@ -93,7 +93,7 @@ struct QGLRect GLfloat right; GLfloat bottom; - operator QRectF() {return QRectF(left, top, right-left, bottom-top);} + operator QRectF() const {return QRectF(left, top, right-left, bottom-top);} }; class QGL2PEXVertexArray |