summaryrefslogtreecommitdiffstats
path: root/util/webkit
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-08 15:38:15 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-08 15:38:15 (GMT)
commit457d178fae492c81276ded4be9f861375eecb23b (patch)
treea0e19fd57f9a7d5a4f1f5668f5bdda570f33c64f /util/webkit
parentf6909d47b981720cb87cb96454cdf9ea493383ee (diff)
parent5fe85b9d0e133734c7789fa9d1565684e15c5e2f (diff)
downloadQt-457d178fae492c81276ded4be9f861375eecb23b.zip
Qt-457d178fae492c81276ded4be9f861375eecb23b.tar.gz
Qt-457d178fae492c81276ded4be9f861375eecb23b.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (56 commits) Fix compile when configure with no fontconfig support Fix warning in qtextengine compilation Reorder member varibles in QGlyphRunPrivate to eliminate warning Revert 36e01e69 Fixed compile of tst_qscriptextensionplugin on some Windows configurations Add function QGlyphRun::setRawData() Correct antialias disabling logic for Core Text Correct QStaticText tests after recent changes Add missing license header. Add basic static text drawing capability to lance Fix Windows build Refactor glyph pretransform check Add the new 'glhypnotizer' demo. Fix problem with cosmetic stroking of cubic beziers Fix autotest to not depend on rasterization details Still use midpoint rendering of aliased ellipses Symbian build failure for Armv5 Fix the wayland windowsurface so that we have stencil and depth buffer We need to let the currentContext be in the same state after Track Wayland changes ...
Diffstat (limited to 'util/webkit')
0 files changed, 0 insertions, 0 deletions