diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-27 04:58:54 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-27 04:58:54 (GMT) |
commit | 000b1e7aeea80655d7293b511be5e135e26aff03 (patch) | |
tree | 13eb7372589b166da02e97ce08bc3b1d4e7973ee /src/gui/text/qfontengine_x11.cpp | |
parent | 06f2a6982680beb5d72321b690af1ac9df5afd95 (diff) | |
parent | 5e28455598096b8c1e3b07498a40909a3aebf9fd (diff) | |
download | Qt-000b1e7aeea80655d7293b511be5e135e26aff03.zip Qt-000b1e7aeea80655d7293b511be5e135e26aff03.tar.gz Qt-000b1e7aeea80655d7293b511be5e135e26aff03.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: (374 commits)
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
Use Ctrl rather than Alt for switching tabs in the demo browser
Doc: add link to new gettings started to index.html
Doc: Fixing bug involving header misplacement in Creator style
...
Diffstat (limited to 'src/gui/text/qfontengine_x11.cpp')
0 files changed, 0 insertions, 0 deletions