diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-28 11:10:40 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-28 11:10:40 (GMT) |
| commit | 8f3cbe7e844ee49b1e25544d9b90218b00efa548 (patch) | |
| tree | 73e501612ef8efdbfce8afbc5d8c6abe109190d3 /src/gui/text/qfontdatabase.cpp | |
| parent | 00cb03e2dfbcaca69da980dc79d5b062d4b09028 (diff) | |
| parent | 5b90f7c27e7e4a95c75421fa42345b3268707794 (diff) | |
| download | Qt-8f3cbe7e844ee49b1e25544d9b90218b00efa548.zip Qt-8f3cbe7e844ee49b1e25544d9b90218b00efa548.tar.gz Qt-8f3cbe7e844ee49b1e25544d9b90218b00efa548.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 139139f..e6c36a4 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -413,7 +413,7 @@ struct QtFontFamily bool fixedPitchComputed : 1; #endif #ifdef Q_WS_X11 - bool symbol_checked; + bool symbol_checked : 1; #endif QString name; |