summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlfontloader.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-12-02 08:54:43 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-12-02 08:54:43 (GMT)
commit5247ee562f76a51b8a81735d7da709d1b9b63796 (patch)
treebbe2b7e2b538082ee158ccef7e8f7d1020798e47 /src/declarative/util/qmlfontloader.cpp
parentbd22fbc0447faa58f3a4ab52ed5545f12a47cd5c (diff)
parentb1ca4dbd2935cb2647aa1650a5185cb918ecb21d (diff)
downloadQt-5247ee562f76a51b8a81735d7da709d1b9b63796.zip
Qt-5247ee562f76a51b8a81735d7da709d1b9b63796.tar.gz
Qt-5247ee562f76a51b8a81735d7da709d1b9b63796.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlfontloader.cpp')
-rw-r--r--src/declarative/util/qmlfontloader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp
index bb26536..ba06e19 100644
--- a/src/declarative/util/qmlfontloader.cpp
+++ b/src/declarative/util/qmlfontloader.cpp
@@ -46,7 +46,7 @@
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QFile>
-#include <QmlContext>
+#include <qmlcontext.h>
#include <qmlengine.h>
#include <QFontDatabase>