summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontinfo.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-26 05:50:54 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-26 05:50:54 (GMT)
commitfd330a5a6009c17e28fb9eb36b5bffbc19c5df68 (patch)
tree16025a01c1aa172fb497b31c3bf8f8fc4edf691c /src/gui/text/qfontinfo.h
parentc55ac19acfcad0e204d9e9dc47fb4bf891924e0a (diff)
parent31461202c1ee2979f88f9642192ab53a2bc7e8cf (diff)
downloadQt-fd330a5a6009c17e28fb9eb36b5bffbc19c5df68.zip
Qt-fd330a5a6009c17e28fb9eb36b5bffbc19c5df68.tar.gz
Qt-fd330a5a6009c17e28fb9eb36b5bffbc19c5df68.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Don't specify a BottomToTop scan line direction for YUV frames. Support expanding aspect ratio in direct show video window control. Support the Expanding aspect ratio mode in the gstreamer window control.
Diffstat (limited to 'src/gui/text/qfontinfo.h')
0 files changed, 0 insertions, 0 deletions