Merge remote branch 'origin/master' into qt-master-from-4.6

Conflicts:
	tests/auto/qlineedit/tst_qlineedit.cpp
	tests/benchmarks/benchmarks.pro

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmllanguage/data/simpleBindings.qml b/tests/auto/declarative/qmllanguage/data/simpleBindings.qml
new file mode 100644
index 0000000..2fcd1a5
--- /dev/null
+++ b/tests/auto/declarative/qmllanguage/data/simpleBindings.qml
@@ -0,0 +1,18 @@
+import Test 1.0
+MyTypeObject {
+    id: me
+    property int v1: 10
+    property int v2: 11
+
+    property int value1
+    property int value2
+    property int value3
+    property int value4
+
+    value1: v1
+    value2: me.v1
+    value3: v1 + v2
+    value4: Math.min(v1, v2)
+
+    objectProperty: me
+}