diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-30 11:11:31 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-30 11:11:31 (GMT) |
commit | 51582e3d1251766a3ed941530d966e1a591cbed6 (patch) | |
tree | 35277186aa3b084561c10b9c1af328192158546c /src/testlib | |
parent | 8cb399e2c2ba47cdf3b27c7c5cb4d8d35702a068 (diff) | |
parent | 40b6c1dd9199ac5e0d6a1921b05c11e647d09dca (diff) | |
download | Qt-51582e3d1251766a3ed941530d966e1a591cbed6.zip Qt-51582e3d1251766a3ed941530d966e1a591cbed6.tar.gz Qt-51582e3d1251766a3ed941530d966e1a591cbed6.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (377 commits)
Correct last right bearing in boundingBox(glyphs)
Make sure propagated font in QGraphicsWidget can be set on a QPainter
Apparently QPen::brush() can't return a NoBrush for a NoPen.
Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.
use QFile:map instead of ::mmap
Do not use global static const references to objects
Revert "Refactor blend_transformed_bilinear to simplify the blend type checking"
Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.
Refactor blend_transformed_bilinear to simplify the blend type checking
Note RTL behavior changes in docs and changelog
Implement qt_memfill32 with Neon.
Implement the composition mode Plus with Neon.
Fix the broken unicode detection of ODBC driver.
Doc: Fixed qdoc warnings.
Doc: updating getting started docs - not finished
Make it possible again to build Qt without webkit
Doc: fixing creator bugs, removing menus and textbox in the header
Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch.
Doc: Fixing overlapping text in header list
...
Diffstat (limited to 'src/testlib')
0 files changed, 0 insertions, 0 deletions