diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-04-10 18:11:30 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 13:15:01 +0200 |
| commit | 6f3bda0dce945a5fc75d8ebad302820fe9979d9b (patch) | |
| tree | 6581aad8a7fb21ccbebe09d23c30af0e3236e266 /src/quick/util/qquickfontloader.cpp | |
| parent | 44f9412bf789d73dd462292038686f5b07026132 (diff) | |
Initial bundle support
Change-Id: I095249f64ecf4ef1e3fbfb164e3d50edffab61e8
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/quick/util/qquickfontloader.cpp')
| -rw-r--r-- | src/quick/util/qquickfontloader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp index 55830f0cc8..2868270121 100644 --- a/src/quick/util/qquickfontloader.cpp +++ b/src/quick/util/qquickfontloader.cpp @@ -52,8 +52,8 @@ #include <QFontDatabase> #include <private/qobject_p.h> -#include <private/qqmlengine_p.h> #include <qqmlinfo.h> +#include <qqmlfile.h> QT_BEGIN_NAMESPACE @@ -196,7 +196,7 @@ void QQuickFontLoader::setSource(const QUrl &url) d->url = url; emit sourceChanged(); - QString localFile = QQmlEnginePrivate::urlToLocalFileOrQrc(d->url); + QString localFile = QQmlFile::urlToLocalFileOrQrc(d->url); if (!localFile.isEmpty()) { if (!d->fonts.contains(d->url)) { int id = QFontDatabase::addApplicationFont(localFile); |