summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontdatabase_s60.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-16 04:15:43 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-16 04:15:43 (GMT)
commitbb8142436bacf5a4fa31880b58a8b3b6bc7b4d5b (patch)
tree0c650301494a1f31c9dcb8f8c8fe5d0259e3d00a /src/gui/text/qfontdatabase_s60.cpp
parent17fbbdd3a081a66e1d2b26db7935111c49cea75e (diff)
parenteb05fde709f958a0a67f83455c02dcde3dfc1493 (diff)
downloadQt-bb8142436bacf5a4fa31880b58a8b3b6bc7b4d5b.zip
Qt-bb8142436bacf5a4fa31880b58a8b3b6bc7b4d5b.tar.gz
Qt-bb8142436bacf5a4fa31880b58a8b3b6bc7b4d5b.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Clean up list examples Document QML_IMPORT_TRACE Document section.delegate Remove duplicated code. Fix bug with childrenRect resizing on startup.
Diffstat (limited to 'src/gui/text/qfontdatabase_s60.cpp')
0 files changed, 0 insertions, 0 deletions