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

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits)
  Add some painting benchmarks.
  Make sure cookies are saved.
  Fix headers::licenseCheck autotest failure
  Re-add accidentally deleted file
  Test SizeItemToLoader to SizeLoaderToItem resizeMode change.
  Document QmlContext ownership.
  Add bug note.
  Fix elision and multilength strings when resizing a Text element.
  Document calling C++ methods from QML.
  Document margins property
  Augment documentation
  doc: There is no easeNone, it is called easeLinear
  doc: Converted the basic types page to use \qmlbasictype
  Focus focusScope from focusing for focusOnPress
  Really run image reader in its own thread.
  Don't create one QNetworkAccessManager per XMLHttpRequest
  We use JavaScript, not ECMAScript.
  XMLHttpRequest redirection
  update Image.paintedWidth and Image.paintedHeight when the source changes
  Remove debug.
  ...

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmllanguage/data/NestedAlias.qml b/tests/auto/declarative/qmllanguage/data/NestedAlias.qml
new file mode 100644
index 0000000..5155612
--- /dev/null
+++ b/tests/auto/declarative/qmllanguage/data/NestedAlias.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+QtObject {
+    property QtObject o1
+    property QtObject o2
+
+    property alias a: object2.a
+
+    o1: QtObject { id: object1 }
+    o2: QtObject { 
+        id: object2 
+        property int a: 1923
+    }
+}