summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2009-10-01 13:13:44 (GMT)
committermread <qt-info@nokia.com>2009-10-01 13:16:37 (GMT)
commit27ad49b1677b06017fb922299efabe7bee320f2f (patch)
tree11cdcd95ba3cc9c4c85b7574913a19352c44ad71 /src
parent2ed4e4afbb267c407699bbb384af778f84168c2f (diff)
downloadQt-27ad49b1677b06017fb922299efabe7bee320f2f.zip
Qt-27ad49b1677b06017fb922299efabe7bee320f2f.tar.gz
Qt-27ad49b1677b06017fb922299efabe7bee320f2f.tar.bz2
S60 qt_init() fix to set system font
This gives the system font the default font family name, which is appropriate for S60, "Series 60 Sans". Without this, the system font has a requested family name of "Helvetica". Upside of this fix is that it makes tst_qFontComboBox pass on S60 Reviewed-by: Alessandro Portale
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qapplication_s60.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 27c7c94..d50e7e1 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -1085,6 +1085,10 @@ void qt_init(QApplicationPrivate * /* priv */, int)
}
#endif
+ QFont systemFont;
+ systemFont.setFamily(systemFont.defaultFamily());
+ QApplicationPrivate::setSystemFont(systemFont);
+
/*
### Commented out for now as parameter handling not needed in SOS(yet). Code below will break testlib with -o flag
int argc = priv->argc;