summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@digia.com>2012-12-14 11:32:13 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-14 22:01:43 (GMT)
commit717e36037cf246aa201c0aaf15a5dcbd7883f159 (patch)
tree20ea7ad038cd1424fc2e93ef94113c526d656eaa /src/gui/text
parent94a5839d74d53832674cd6eca49c980bac27fc04 (diff)
downloadQt-717e36037cf246aa201c0aaf15a5dcbd7883f159.zip
Qt-717e36037cf246aa201c0aaf15a5dcbd7883f159.tar.gz
Qt-717e36037cf246aa201c0aaf15a5dcbd7883f159.tar.bz2
Mac: fix bugs for font selection in QFontDialog
Use localized family name and style name when selecting font with non-English locale Task-number: QTBUG-27415 Change-Id: Ia10aaff50e1ffdb248c730fb46a8a66088ee64bb (cherry picked from qtbase/3c09f6bc9aee0c97427fe8da6efdc73b4ac473aa) Reviewed-by: Liang Qi <liang.qi@digia.com>
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 6d16701..10ef906 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -769,7 +769,7 @@ QtFontFamily *QFontDatabasePrivate::family(const QString &f, bool create)
if (res < 0)
pos++;
- // qDebug("adding family %s at %d total=%d", f.latin1(), pos, count);
+ // qDebug() << "adding family " << f.toLatin1() << " at " << pos << " total=" << count;
if (!(count % 8)) {
QtFontFamily **newFamilies = (QtFontFamily **)
realloc(families,