summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-11 05:23:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-11 05:23:53 (GMT)
commit892d4b5e6e9495e29c4df40383e883fc19aa0baa (patch)
tree78834eb66956257fe5ff2271917d81912b2adaaf /tools
parentdbfe5f81e300de3a43311197826f23ff031b4b23 (diff)
parent8b20c0ec6d676b3b297b8fa0ee436ad2e3d9a720 (diff)
downloadQt-892d4b5e6e9495e29c4df40383e883fc19aa0baa.zip
Qt-892d4b5e6e9495e29c4df40383e883fc19aa0baa.tar.gz
Qt-892d4b5e6e9495e29c4df40383e883fc19aa0baa.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added geometry shaders to changes-4.7.0 file + a small doc update about it Crash when deleting the parent of a context menu while it is being displayed Workaround for a certain functionally challenged compiler Fix failing QDoubleValidator tests Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0. QMainWindow: update the separator size when the style change Another round of Geometry shader review. Fix Geometry shaders based on review Geometry Shader support in QGLShaderProgram
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions