summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2010-09-17 05:34:44 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2010-09-17 05:36:06 (GMT)
commiteef26bc8521da62db0dced6796eceb7c27f64160 (patch)
treed057b1d8056c297ea76556ef2af6cb9ecb80a04f /src/declarative/util
parentaf29c555a29ebcdb1d962176912478212c9c7e65 (diff)
downloadQt-eef26bc8521da62db0dced6796eceb7c27f64160.zip
Qt-eef26bc8521da62db0dced6796eceb7c27f64160.tar.gz
Qt-eef26bc8521da62db0dced6796eceb7c27f64160.tar.bz2
Autotest and small fix for QDeclarativeFontLoader.
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qdeclarativefontloader.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index 91588b7..6879494 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -210,11 +210,7 @@ void QDeclarativeFontLoader::setSource(const QUrl &url)
updateFontInfo(QString(), Error);
}
} else {
- QDeclarativeFontObject *fo = d->fonts[d->url];
- d->name = QFontDatabase::applicationFontFamilies(fo->id).at(0);
- emit nameChanged();
- d->status = QDeclarativeFontLoader::Ready;
- emit statusChanged();
+ updateFontInfo(QFontDatabase::applicationFontFamilies(d->fonts[d->url]->id).at(0), Ready);
}
} else
#endif