summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-13 10:07:42 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-13 10:07:42 (GMT)
commit5099edac8485e41ed4187fc18a42cbfc2bc43023 (patch)
tree85abbbd4e8ac1ec28d9e734e28fa9c4b19327bbe /qmake
parent48e08ee5718b3de855ecea626179ad5323e38fa0 (diff)
parent826d995ff48a01fffc22eafe7b3127e44ed60496 (diff)
downloadQt-5099edac8485e41ed4187fc18a42cbfc2bc43023.zip
Qt-5099edac8485e41ed4187fc18a42cbfc2bc43023.tar.gz
Qt-5099edac8485e41ed4187fc18a42cbfc2bc43023.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits) Fixed tst_qgl multipleFBOInterleavedRendering. Update autotest database connection settings SQL 4.6.1 changelog My changes Significant digits were lost in QDoubleSpinBox range when changing precision My changelog for 4.6.1. Added my changes to the 4.6.1 change log. Put LinesHint into QVectorPath hints to enable further optimizations Update changes file for 4.6.1 Avoid coordinate limitations in the raster engine. Update changelog with my 4.6.1 changes. 4.6.1 changes Fixed bug where QGLPixmapData::toImage() returned too dark image. Update change log with Yoann Lopes work. Fix completion in QFileDialog. Fix point drawing on raster engine for flat and square caps Update changes file with Rhys Weatherley's work. warning fixes for platforms, where qreal == float fix release mode crash in qfont.cpp initFontSubst() on Windows mobile Fixed justify aligned text drawing with the GL1 engine. ...
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions