summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-06-24 11:12:39 (GMT)
committeraxis <qt-info@nokia.com>2010-06-24 11:12:39 (GMT)
commit5ce3b09f9b3c574fc4ab2ecc42f879e64df0e6a1 (patch)
tree8c7b8256e039f51f2642fda75471336a5a76dcfd /src/gui/text
parent4df92b8b5e7f44d7a5e2b91f23638c92512b41f9 (diff)
parent3555687f5ff270c61499a5597444895bec0d70fb (diff)
downloadQt-5ce3b09f9b3c574fc4ab2ecc42f879e64df0e6a1.zip
Qt-5ce3b09f9b3c574fc4ab2ecc42f879e64df0e6a1.tar.gz
Qt-5ce3b09f9b3c574fc4ab2ecc42f879e64df0e6a1.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontdatabase.cpp2
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;