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

Conflicts:
	src/declarative/fx/qfxtext.cpp

1 files changed, 10 insertions, 8 deletions

diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp
index 939a933..8d5ae87 100644
--- a/src/declarative/fx/qfxtext.cpp
+++ b/src/declarative/fx/qfxtext.cpp
@@ -634,15 +634,17 @@ QPixmap QFxTextPrivate::wrappedTextImage(bool drawStyle)
 
     //paint text
     QPixmap img(size);
-    img.fill(Qt::transparent);
-    QPainter p(&img);
-    if (drawStyle) {
-        p.setPen(styleColor);
+    if (!size.isEmpty()) {
+        img.fill(Qt::transparent);
+        QPainter p(&img);
+        if (drawStyle) {
+            p.setPen(styleColor);
+        }
+        else
+            p.setPen(color);
+        p.setFont(font);
+        layout.draw(&p, QPointF(0, 0));
     }
-    else
-        p.setPen(color);
-    p.setFont(font);
-    layout.draw(&p, QPointF(0, 0));
     return img;
 }