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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (101 commits)
  Fix QTextEdit::selectAll crash from textChanged()
  Fix proxy reading from gconf so that it is only done once / session.
  rebuild configure
  fix misleading uppercasing deprecation warning
  Enable Phonon on Symbian by default.
  Disable OpenGL on Symbian only by default instead of always
  VFP type on ARM option in Linux configure script
  Adding -dont-process option to Unix configure script
  Synchronized configure.exe OpenGL options with Unix configure
  build lrelease as part of the "libs" part.
  purge vestiges of imageformat-plugins
  Unify epocroot usage in createpackage and patch_capabilities scripts
  Update visual tests for the recent qmlviewer change
  Do not use openGL on Mac OS X for QML visual tests
  Give qmlviewer a minimum size if root object has no size.
  Add 'Writing New Components' docs, and document the connect() function.
  Mention that image providers should be added before loading QML files
  Update QML visual tests
  Cleaned up sis_targets.prf
  Append qml import path individually for each available drive on Symbian
  ...

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativeproperty/data/aliasPropertyBindings.qml b/tests/auto/declarative/qdeclarativeproperty/data/aliasPropertyBindings.qml
new file mode 100644
index 0000000..a253a58
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeproperty/data/aliasPropertyBindings.qml
@@ -0,0 +1,19 @@
+import QtQuick 1.0
+
+Item {
+    id: root
+
+    property real test: 9
+    property real test2: 3
+
+    property real realProperty: test * test + test
+    property alias aliasProperty: root.realProperty
+
+    states: State {
+        name: "switch"
+        PropertyChanges {
+            target: root
+            aliasProperty: 32 * test2
+        }
+    }
+}