summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_s60.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-11 13:39:44 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-11 13:39:44 +1000
commit2aa21ab606a14ba63acb8f42fe4eb9f99ddad277 (patch)
tree11ba4ec8982856a92ecd789eb8db7d8e9ab72710 /src/gui/text/qfontengine_s60.cpp
parenteabde99a0e9e4c5e49a05187530cf643258d5719 (diff)
parent68ca68ad38d27b9dd9e9fa2094bb50a1a70daaeb (diff)
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: refuse to open empty translation files
Diffstat (limited to 'src/gui/text/qfontengine_s60.cpp')
0 files changed, 0 insertions, 0 deletions