summaryrefslogtreecommitdiffstats
path: root/src/gui/inputmethod/qinputcontext_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-09 01:54:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-09 01:54:35 (GMT)
commit99233e3ed58120859f97e0ce1940523d188f85af (patch)
tree1b4bf3b7b9c0ab97c8a7c57854bc6850a7954cd6 /src/gui/inputmethod/qinputcontext_p.h
parent0d3531e2405b77b9f3acff437b44a7b96d64f586 (diff)
parent3c42576f2ef0cd9a2b55f33991f1fa8b168e5c03 (diff)
downloadQt-99233e3ed58120859f97e0ce1940523d188f85af.zip
Qt-99233e3ed58120859f97e0ce1940523d188f85af.tar.gz
Qt-99233e3ed58120859f97e0ce1940523d188f85af.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pulled code form initializeDb() out into addFontToScreenDevice() Moved font list getter to qfontdatabase_s60.cpp. Reusable. Pulled some code from One long function into a short one
Diffstat (limited to 'src/gui/inputmethod/qinputcontext_p.h')
0 files changed, 0 insertions, 0 deletions