diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-06-05 08:52:24 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-06-05 08:52:24 (GMT) |
| commit | 6d25d222b2bb418139e123b59366db908ee3188a (patch) | |
| tree | e00b67dcf860d5cd9bcdcaccf8bfc56f55269e94 /src/gui/text | |
| parent | cea8678e5fca8b33bbd5da057282888bc260a5c9 (diff) | |
| parent | e50916796adc0dee112505ed617f9b83e99526fb (diff) | |
| download | Qt-6d25d222b2bb418139e123b59366db908ee3188a.zip Qt-6d25d222b2bb418139e123b59366db908ee3188a.tar.gz Qt-6d25d222b2bb418139e123b59366db908ee3188a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontdatabase_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp index 605a7dd..8f67cec 100644 --- a/src/gui/text/qfontdatabase_x11.cpp +++ b/src/gui/text/qfontdatabase_x11.cpp @@ -392,7 +392,7 @@ int qt_mib_for_xlfd_encoding(const char *encoding) int id = qt_xlfd_encoding_id(encoding); if (id != -1) return xlfd_encoding[id].mib; return 0; -}; +} int qt_encoding_id_for_mib(int mib) { |