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: (26 commits)
  Use canonical form for headers
  Remove exporting of QDeclarativeContext class symbols
  Remove non-existing header from pri file
  Fix Loader crash.
  Compile in namespace
  Deprecate inline Script {} blocks
  Update metaobjectbuilder version test.
  Set role names for QFileSystemModel and QDirModel
  Removed wrong parenthesis around property NOTIFY declaration
  Remove dead performance measurement code from QML
  Fix warning mentioned in the comments of QTBUG-9182.
  Fix test.
  Ensure positioner animations are triggered correctly
  Fix qdeclarativeqt::createQmlObject autotest
  Add MiddleButton = MidButton to MouseButtons enum.
  Fix qdeclarativetextedit::delegateLoading autotest
  Fix Behavior documentation due to easing changes.
  Fix crash when calling createObject on a component with errors.
  Initialize variable.
  Produce an error when trying to create objects in a PropertyChanges.
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index c1dc924..8ba9d45 100644
--- a/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -139,10 +139,10 @@ void tst_QMetaObjectBuilder::mocVersionCheck()
     // It is intended as a reminder to also update QMetaObjectBuilder
     // whenenver moc changes.  Once QMetaObjectBuilder has been
     // updated, this test can be changed to check for the next version.
-    QEXPECT_FAIL("", "QT-2918", Continue);
-    QCOMPARE(int(QObject::staticMetaObject.d.data[0]), 4);
-    QEXPECT_FAIL("", "QT-2918", Continue);
-    QCOMPARE(int(staticMetaObject.d.data[0]), 4);
+    int version = int(QObject::staticMetaObject.d.data[0]);
+    QVERIFY(version == 4 || version == 5);
+    version = int(staticMetaObject.d.data[0]);
+    QVERIFY(version == 4 || version == 5);
 }
 
 void tst_QMetaObjectBuilder::create()