diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 06:52:38 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 06:52:38 +0200 |
| commit | c74dac2a0ef5d1b428c4da4e48fab05f9886233a (patch) | |
| tree | 40e78ea3b3080a36cc1d506fd26029727ed78195 /src/gui/text/qfontengine_p.h | |
| parent | 4676dd62871da2b58452ebda477a04c25158bec4 (diff) | |
| parent | 0590d94c5bef0f68123d0508b9c17d0f3f7dc01f (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
QtWebKit: Fixes compilation on MSVC 64
QtWebKit: Remove translatable strings from tests/hybridPixmap.
Remove overloaded placement new operators
WINSCW compiler fix, too eager to solve inlines
WINSCW boolean fix for XPATH
WINSCW compile fix for HashMap
WINSCW compile fix for WebCore
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
0 files changed, 0 insertions, 0 deletions