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

3 files changed, 23 insertions, 7 deletions

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/tests/auto/declarative/behaviors/tst_behaviors.cpp b/tests/auto/declarative/behaviors/tst_behaviors.cpp
index 29c631d..da910d9 100644
--- a/tests/auto/declarative/behaviors/tst_behaviors.cpp
+++ b/tests/auto/declarative/behaviors/tst_behaviors.cpp
@@ -225,11 +225,9 @@ void tst_behaviors::reassignedAnimation()
     QTest::ignoreMessage(QtWarningMsg, "QML QmlBehavior (file://" SRCDIR "/data/reassignedAnimation.qml:9:12) Can't change the animation assigned to a Behavior.");
     QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
     QVERIFY(rect);
-    
-    rect->setState("moved");
-    QTest::qWait(200 + 100);
-    qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
-    QCOMPARE(x, qreal(200));  //i.e. the right behavior has been triggered
+    QCOMPARE(qobject_cast<QmlNumberAnimation*>(
+                 qobject_cast<QmlBehavior*>(
+                     rect->findChild<QmlBehavior*>("MyBehavior"))->animation())->duration(), 200);
 }
 
 QTEST_MAIN(tst_behaviors)
diff --git a/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp b/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp
index a7211bd..9be77e8 100644
--- a/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp
+++ b/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp
@@ -55,6 +55,7 @@ public:
 private slots:
     void insert();
     void operatorInsert();
+    void operatorValue();
     void clear();
     void changed();
     void count();
@@ -66,6 +67,7 @@ void tst_QmlPropertyMap::insert()
     map.insert(QLatin1String("key1"),100);
     map.insert(QLatin1String("key2"),200);
     QVERIFY(map.keys().count() == 2);
+    QVERIFY(map.contains(QLatin1String("key1")));
 
     QCOMPARE(map.value(QLatin1String("key1")), QVariant(100));
     QCOMPARE(map.value(QLatin1String("key2")), QVariant(200));
@@ -88,6 +90,20 @@ void tst_QmlPropertyMap::operatorInsert()
     QCOMPARE(map.value(QLatin1String("key1")), QVariant("Hello World"));
 }
 
+void tst_QmlPropertyMap::operatorValue()
+{
+    QmlPropertyMap map;
+    map.insert(QLatin1String("key1"),100);
+    map.insert(QLatin1String("key2"),200);
+    QVERIFY(map.keys().count() == 2);
+    QVERIFY(map.contains(QLatin1String("key1")));
+
+    QCOMPARE(map.value(QLatin1String("key1")), QVariant(100));
+    QCOMPARE(map.value(QLatin1String("key2")), QVariant(200));
+    QCOMPARE(map[QLatin1String("key1")], map.value(QLatin1String("key1")));
+    QCOMPARE(map[QLatin1String("key2")], map.value(QLatin1String("key2")));
+}
+
 void tst_QmlPropertyMap::clear()
 {
     QmlPropertyMap map;
@@ -98,6 +114,7 @@ void tst_QmlPropertyMap::clear()
 
     map.clear(QLatin1String("key1"));
     QVERIFY(map.keys().count() == 1);
+    QVERIFY(map.contains(QLatin1String("key1")));
     QCOMPARE(map.value(QLatin1String("key1")), QVariant());
 }
 
@@ -143,6 +160,7 @@ void tst_QmlPropertyMap::count()
     //clearing doesn't remove the key
     map.clear(QLatin1String("key3"));
     QCOMPARE(map.count(), 3);
+    QCOMPARE(map.size(), map.count());
 }
 
 QTEST_MAIN(tst_QmlPropertyMap)