Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (53 commits)
  Be consistent in conversion from string (eg. color, int rounding).
  Simplify code to make next change clearer.
  Stop warnings.
  Improve error messages when tests fail.
  Stop highlight animators for highlightFollowsCurrentItem: false
  Ensure valuetype enums can be assigned from JS
  Improve testcase
  Rename Component::errorsString() -> errorString() (and also for
  Fixes for docs, example code
  Make test more stable
  Autotest (XFAIL) for QTBUG-10822
  Add return value for resolveTypeInNamespace
  Fix test
  Fix test. Missed files.
  Missing break
  Create overview page for examples for Extending QML in C++
  Search for QML import libraries also in application directory
  Doc improvements
  Disable mouse-based selection in TextInput/TextEdit
  Rename qml executable to qmlviewer
  ...

1 files changed, 3 insertions, 2 deletions

diff --git a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
index dd2f46e..b183105 100644
--- a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
+++ b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
@@ -45,6 +45,7 @@
 #include <QtDeclarative/qdeclarativeview.h>
 #include <QtDeclarative/qdeclarativeitem.h>
 #include <QtGui/qgraphicswidget.h>
+#include "../../../shared/util.h"
 
 class tst_QDeclarativeView : public QObject
 
@@ -106,9 +107,9 @@ void tst_QDeclarativeView::resizemodedeclarativeitem()
     // size update from root object
     declarativeItem->setWidth(250);
     declarativeItem->setHeight(350);
-    qApp->processEvents();
     QCOMPARE(declarativeItem->width(), 250.0);
     QCOMPARE(declarativeItem->height(), 350.0);
+    QTRY_COMPARE(canvas->size(), QSize(250, 350));
     QCOMPARE(canvas->size(), QSize(250, 350));
     QCOMPARE(canvas->size(), canvas->sizeHint());
     QCOMPARE(sceneResizedSpy.count(), 4);
@@ -134,9 +135,9 @@ void tst_QDeclarativeView::resizemodedeclarativeitem()
     // size update from root object
     declarativeItem->setWidth(80);
     declarativeItem->setHeight(100);
-    qApp->processEvents();
     QCOMPARE(declarativeItem->width(), 80.0);
     QCOMPARE(declarativeItem->height(), 100.0);
+    QTRY_COMPARE(canvas->size(), QSize(80, 100));
     QCOMPARE(canvas->size(), QSize(80, 100));
     QCOMPARE(canvas->size(), canvas->sizeHint());
     QCOMPARE(sceneResizedSpy2.count(), 2);