summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontdatabase_x11.cpp
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2009-06-04 23:55:22 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-06-04 23:55:22 (GMT)
commitef0d1c839aed75201da10f8db7e515d9fb55bb16 (patch)
tree5f00de5b8913379f9bb28df91782840c7efe6a2d /src/gui/text/qfontdatabase_x11.cpp
parent58c5df4109acf44982c3a2a7b2318da52606232d (diff)
downloadQt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.zip
Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.gz
Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.bz2
All of Qt's own code compiles with -pedantic now (but pcre and webkit don't seem fixable easily)
Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/gui/text/qfontdatabase_x11.cpp')
-rw-r--r--src/gui/text/qfontdatabase_x11.cpp2
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)
{