summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qmap.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-18 17:24:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-18 17:24:14 (GMT)
commit52e517b50aafd6cc0bec597abd50d8b3f7e982dd (patch)
tree66b8a2a58479d438b5c71f2bff453e5357eaef46 /src/corelib/tools/qmap.h
parent7cfae48c7ff8b0f8fa6e0a530ff86b30c1665508 (diff)
parent3a1ad930266b7b10c04ee0481e6fa6b0b6bed739 (diff)
downloadQt-52e517b50aafd6cc0bec597abd50d8b3f7e982dd.zip
Qt-52e517b50aafd6cc0bec597abd50d8b3f7e982dd.tar.gz
Qt-52e517b50aafd6cc0bec597abd50d8b3f7e982dd.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: Always use display() in QEglContext, so initialization can occur Fixed a regression in dockwidgets that would jump when toplevel resized Stabilize QGraphicsView benchmarks. Remove platform dependent code from QGraphicsView benchmark. Compiler warnings in QGraphicsView benchmark. Stabilize QGraphicsScene benchmarks. Compiler warning, unusable variable in tst_QGraphicsScene benchmark. Documented behavior of blur effect radius and drop shadow offset. Fixed autotest failure in tst_QPainter::drawEllipse on Maemo.
Diffstat (limited to 'src/corelib/tools/qmap.h')
0 files changed, 0 insertions, 0 deletions