Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 5 insertions, 3 deletions

diff --git a/src/declarative/extra/qmlfontloader.cpp b/src/declarative/extra/qmlfontloader.cpp
index 8c17d0f..e8db649 100644
--- a/src/declarative/extra/qmlfontloader.cpp
+++ b/src/declarative/extra/qmlfontloader.cpp
@@ -163,6 +163,8 @@ void QmlFontLoader::setName(const QString &name)
         return;
     d->name = name;
     emit nameChanged();
+    d->status = Ready;
+    emit statusChanged();
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp
index 6790923..d640fc9 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp
@@ -534,7 +534,7 @@ void QmlGraphicsTextPrivate::updateSize()
 
 void QmlGraphicsTextPrivate::drawOutline()
 {
-    QPixmap img = QPixmap(imgCache.size());
+    QPixmap img = QPixmap(imgStyleCache.width()+2,imgStyleCache.height()+2);
     img.fill(Qt::transparent);
 
     QPainter ppm(&img);
@@ -558,7 +558,7 @@ void QmlGraphicsTextPrivate::drawOutline()
 
 void QmlGraphicsTextPrivate::drawOutline(int yOffset)
 {
-    QPixmap img = QPixmap(imgCache.size());
+    QPixmap img = QPixmap(imgStyleCache.width()+2,imgStyleCache.height()+2);
     img.fill(Qt::transparent);
 
     QPainter ppm(&img);
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index b93a9b3..3253e72 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -2366,7 +2366,7 @@ bool QmlCompiler::buildBinding(QmlParser::Value *value,
                                QmlParser::Property *prop,
                                const BindingContext &ctxt)
 {
-    Q_ASSERT(prop->index);
+    Q_ASSERT(prop->index != -1);
     Q_ASSERT(prop->parent);
     Q_ASSERT(prop->parent->metaObject());