diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-06 15:02:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-06 15:02:33 (GMT) |
| commit | cb11bb0df08f134bbded52fd4140197a01570a0e (patch) | |
| tree | af3fc327b4da04662e9ae6430028ec70c6680e4a /src/3rdparty/webkit/WebCore/Resources/missingImage.png | |
| parent | ecfac86a9b9427ded184dc01dfd03b7ab3e69082 (diff) | |
| parent | 6415e22649dd8620728c8c32b918c7afb8efc4dc (diff) | |
| download | Qt-cb11bb0df08f134bbded52fd4140197a01570a0e.zip Qt-cb11bb0df08f134bbded52fd4140197a01570a0e.tar.gz Qt-cb11bb0df08f134bbded52fd4140197a01570a0e.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fix S60 compile
Remove some metrics parsing code from Core Text
Fix compilation with c++0x mode
Fix Windows compile
Move styleName out of QtFontStyle::Key
Fix regressions in previous QFontDatabase patch
Don't issue GL calls when the geometry is empty
Fixed missing painting with X11 paint engine.
Add font related changes in 4.8 into changes
Store styleName in font database
Diffstat (limited to 'src/3rdparty/webkit/WebCore/Resources/missingImage.png')
0 files changed, 0 insertions, 0 deletions