summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_win_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-26 12:28:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-26 12:28:38 (GMT)
commit4fb6cae4dd0c6a90008780df606abb8a9e73cb2c (patch)
treef7c96ff2d371807347f200ebff98ece60b00a0f2 /src/gui/text/qfontengine_win_p.h
parentfd330a5a6009c17e28fb9eb36b5bffbc19c5df68 (diff)
parentf1bbb1648a9770f37ca39b8d68d6bd269dd06250 (diff)
downloadQt-4fb6cae4dd0c6a90008780df606abb8a9e73cb2c.zip
Qt-4fb6cae4dd0c6a90008780df606abb8a9e73cb2c.tar.gz
Qt-4fb6cae4dd0c6a90008780df606abb8a9e73cb2c.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Qualify ptrdiff_t's namespace in stltest configure test Fix the bug where the ampersand symbol would be discarded. QtScript: Add missing API shim for signal handling Designer: Fix broken resource view filtering.
Diffstat (limited to 'src/gui/text/qfontengine_win_p.h')
0 files changed, 0 insertions, 0 deletions