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

Conflicts:
	examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml

16 files changed, 51 insertions, 4 deletions

diff --git a/examples/declarative/README b/examples/declarative/README
index 9e0f4c4266..578c2458a6 100644
--- a/examples/declarative/README
+++ b/examples/declarative/README
@@ -1,5 +1,5 @@
 The Qt Declarative module provides the ability to specify and implement
-your UI declaratively, using the Qt Meta-Object Language(QML). This
+your user interface declaratively, using the Qt Meta-Object Language (QML). This
 language is very expressive and human readable, and can be used by
 designers to actually implement their UI vision. QML UIs can integrate
 with C++ code in many ways, including being loaded as a part of a C++ UI
@@ -9,7 +9,7 @@ The example launcher provided with Qt can be used to explore each of the
 examples in this directory. But most can also be viewed directly with the
 QML viewer utility, without requiring compilation.
 
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Tutorials and Examples
 link in the main Qt documentation.
 
 
diff --git a/examples/declarative/animation/easing/easing.qml b/examples/declarative/animation/easing/easing.qml
index 91802523d5..9cdbad142b 100644
--- a/examples/declarative/animation/easing/easing.qml
+++ b/examples/declarative/animation/easing/easing.qml
@@ -76,7 +76,7 @@ Rectangle {
         ListElement { name: "Easing.InOutCirc"; type: Easing.InOutCirc; ballColor: "RosyBrown" }
         ListElement { name: "Easing.OutInCirc"; type: Easing.OutInCirc; ballColor: "SandyBrown" }
         ListElement { name: "Easing.InElastic"; type: Easing.InElastic; ballColor: "DarkGoldenRod" }
-        ListElement { name: "Easing.InElastic"; type: Easing.OutElastic; ballColor: "Chocolate" }
+        ListElement { name: "Easing.OutElastic"; type: Easing.OutElastic; ballColor: "Chocolate" }
         ListElement { name: "Easing.InOutElastic"; type: Easing.InOutElastic; ballColor: "SaddleBrown" }
         ListElement { name: "Easing.OutInElastic"; type: Easing.OutInElastic; ballColor: "Brown" }
         ListElement { name: "Easing.InBack"; type: Easing.InBack; ballColor: "Maroon" }
diff --git a/examples/declarative/modelviews/webview/content/Mapping/map.html b/examples/declarative/modelviews/webview/content/Mapping/map.html
index a8726fd654..a98da5430f 100755
--- a/examples/declarative/modelviews/webview/content/Mapping/map.html
+++ b/examples/declarative/modelviews/webview/content/Mapping/map.html
@@ -25,6 +25,14 @@
     } else {
         goToLatLng(new google.maps.LatLng(window.qml.lat,window.qml.lng));
     }
+    if (navigator.geolocation) {
+      navigator.geolocation.getCurrentPosition(function(position) {
+        initialLocation = new google.maps.LatLng(position.coords.latitude,position.coords.longitude);
+        window.qml.lat = initialLocation.lat;
+        window.qml.lng = initialLocation.lng;
+        goToLatLng(initialLocation);
+      });
+    }
   }
   function goToAddress() {
       if (geocoder) {
diff --git a/examples/declarative/toys/README b/examples/declarative/toys/README
index 7fd7eb0bbc..ff4d0242d7 100644
--- a/examples/declarative/toys/README
+++ b/examples/declarative/toys/README
@@ -1,4 +1,4 @@
-These pure QML examples create complete components to demonstrate
+These pure QML examples demonstrate
 some of what can be easily done using just a few QML files.
 
 The example launcher provided with Qt can be used to explore each of the
diff --git a/examples/declarative/ui-components/README b/examples/declarative/ui-components/README
new file mode 100644
index 0000000000..7eecec104a
--- /dev/null
+++ b/examples/declarative/ui-components/README
@@ -0,0 +1,39 @@
+With Qt Declarative, it is easy to implement the UI components that you need
+in exactly the way that you want. These examples demonstrate this by creating
+a selection of user interface components where the look and feel has been
+completely defined in a QML file.
+
+The example launcher provided with Qt can be used to explore each of the
+examples in this directory. But most can also be viewed directly with the
+QML viewer utility, without requiring compilation.
+
+Documentation for these examples can be found via the Tutorials and Examples
+link in the main Qt documentation.
+
+
+Finding the Qt Examples and Demos launcher
+==========================================
+
+On Windows:
+
+The launcher can be accessed via the Windows Start menu. Select the menu
+entry entitled "Qt Examples and Demos" entry in the submenu containing
+the Qt tools.
+
+On Mac OS X:
+
+For the binary distribution, the qtdemo executable is installed in the
+/Developer/Applications/Qt directory. For the source distribution, it is
+installed alongside the other Qt tools on the path specified when Qt is
+configured.
+
+On Unix/Linux:
+
+The qtdemo executable is installed alongside the other Qt tools on the path
+specified when Qt is configured.
+
+On all platforms:
+
+The source code for the launcher can be found in the demos/qtdemo directory
+in the Qt package. This example is built at the same time as the Qt libraries,
+tools, examples, and demonstrations.
diff --git a/examples/declarative/toys/dial-example/content/Dial.qml b/examples/declarative/ui-components/dialcontrol/content/Dial.qml
index 2b421bf7c8..2b421bf7c8 100644
--- a/examples/declarative/toys/dial-example/content/Dial.qml
+++ b/examples/declarative/ui-components/dialcontrol/content/Dial.qml
diff --git a/examples/declarative/toys/dial-example/content/background.png b/examples/declarative/ui-components/dialcontrol/content/background.png
index 75d555d7ab..75d555d7ab 100644
--- a/examples/declarative/toys/dial-example/content/background.png
+++ b/examples/declarative/ui-components/dialcontrol/content/background.png
diff --git a/examples/declarative/toys/dial-example/content/needle.png b/examples/declarative/ui-components/dialcontrol/content/needle.png
index 2d19f75039..2d19f75039 100644
--- a/examples/declarative/toys/dial-example/content/needle.png
+++ b/examples/declarative/ui-components/dialcontrol/content/needle.png
diff --git a/examples/declarative/toys/dial-example/content/needle_shadow.png b/examples/declarative/ui-components/dialcontrol/content/needle_shadow.png
index 8d8a928cc5..8d8a928cc5 100644
--- a/examples/declarative/toys/dial-example/content/needle_shadow.png
+++ b/examples/declarative/ui-components/dialcontrol/content/needle_shadow.png
diff --git a/examples/declarative/toys/dial-example/content/overlay.png b/examples/declarative/ui-components/dialcontrol/content/overlay.png
index 3860a7b590..3860a7b590 100644
--- a/examples/declarative/toys/dial-example/content/overlay.png
+++ b/examples/declarative/ui-components/dialcontrol/content/overlay.png
diff --git a/examples/declarative/toys/dial-example/dial.qmlproject b/examples/declarative/ui-components/dialcontrol/dial.qmlproject
index d4909f8685..d4909f8685 100644
--- a/examples/declarative/toys/dial-example/dial.qmlproject
+++ b/examples/declarative/ui-components/dialcontrol/dial.qmlproject
diff --git a/examples/declarative/toys/dial-example/dial-example.qml b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
index 95df68c638..95df68c638 100644
--- a/examples/declarative/toys/dial-example/dial-example.qml
+++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
diff --git a/examples/declarative/ui-components/flipable/flipable-example.qml b/examples/declarative/ui-components/flipable/flipable.qml
index 479e35b413..479e35b413 100644
--- a/examples/declarative/ui-components/flipable/flipable-example.qml
+++ b/examples/declarative/ui-components/flipable/flipable.qml
diff --git a/examples/declarative/ui-components/progressbar/progressbars.qml b/examples/declarative/ui-components/progressbar/main.qml
index 22f8dbdd4b..22f8dbdd4b 100644
--- a/examples/declarative/ui-components/progressbar/progressbars.qml
+++ b/examples/declarative/ui-components/progressbar/main.qml
diff --git a/examples/declarative/ui-components/scrollbar/display.qml b/examples/declarative/ui-components/scrollbar/main.qml
index 1f7992b542..1f7992b542 100644
--- a/examples/declarative/ui-components/scrollbar/display.qml
+++ b/examples/declarative/ui-components/scrollbar/main.qml
diff --git a/examples/declarative/ui-components/tabwidget/tabs.qml b/examples/declarative/ui-components/tabwidget/main.qml
index e11902a516..e11902a516 100644
--- a/examples/declarative/ui-components/tabwidget/tabs.qml
+++ b/examples/declarative/ui-components/tabwidget/main.qml