summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfont.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-17 13:17:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-17 13:17:14 (GMT)
commit509ef11ab4ba6165c16d9d311c4a1bf7cdfd2528 (patch)
tree2061ffe59d07725e429d23e0cc7ff137a67113e1 /src/gui/text/qfont.h
parentaeb1e4426d85de5d19a81c96ba565a764ff962cf (diff)
parenteb79e5ebf67de67f8c7bf3db20ceae93b46252b3 (diff)
downloadQt-509ef11ab4ba6165c16d9d311c4a1bf7cdfd2528.zip
Qt-509ef11ab4ba6165c16d9d311c4a1bf7cdfd2528.tar.gz
Qt-509ef11ab4ba6165c16d9d311c4a1bf7cdfd2528.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: re-add overriding of tool paths to configure
Diffstat (limited to 'src/gui/text/qfont.h')
0 files changed, 0 insertions, 0 deletions