Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/quick/items/qquickrectangle.cpp

Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc

4 files changed, 7 insertions, 6 deletions

diff --git a/examples/quick/dialogs/systemdialogs/FileDialogs.qml b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
index bfc160fa45..d6ee1a13ca 100644
--- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
@@ -173,7 +173,7 @@ Rectangle {
                 text: "go to /tmp"
                 anchors.verticalCenter: parent.verticalCenter
                 // TODO: QTBUG-29814 This isn't portable, but we don't expose QDir::tempPath to QML yet.
-                onClicked: fileDialog.folder = "/tmp" // file:///tmp would also be OK
+                onClicked: fileDialog.folder = (Qt.platform.os === "windows" ? "/c:/temp" : "/tmp")
             }
         }
     }
diff --git a/examples/quick/text/imgtag/imgtag.qml b/examples/quick/text/imgtag/imgtag.qml
index 892933cab0..8cb85ba86d 100644
--- a/examples/quick/text/imgtag/imgtag.qml
+++ b/examples/quick/text/imgtag/imgtag.qml
@@ -78,10 +78,10 @@ Rectangle {
                 text: "Some hearts<img src=\"images/heart200.png\" width=\"20\" height=\"20\" align=\"bottom\"><img src=\"images/heart200.png\" width=\"30\" height=\"30\" align=\"bottom\"> <img src=\"images/heart200.png\" width=\"40\" height=\"40\"><img src=\"images/heart200.png\" width=\"50\" height=\"50\" align=\"bottom\">with different sizes."
             }
             TextWithImage {
-                text: "Resized image<img width=\"80\" height=\"76\" align=\"middle\" src=\"http://files.app4mobile.com/wp-content/uploads/2011/08/nokia-n9-price-specification-features-us-europe-india.jpg\">from the internet."
+                text: "Resized image<img width=\"48\" height=\"48\" align=\"middle\" src=\"http://qt-project.org/images/qt13a/Qt-logo.png\">from the internet."
             }
             TextWithImage {
-                text: "Image<img align=\"middle\" src=\"http://qt.gitorious.org/images/sites/qt/logo.png\">from the internet."
+                text: "Image<img align=\"middle\" src=\"http://qt-project.org/images/qt13a/Qt-logo.png\">from the internet."
             }
             TextWithImage {
                 height: 120
diff --git a/examples/quick/window/ScreenInfo.qml b/examples/quick/window/ScreenInfo.qml
index e422a51a71..73700720d8 100644
--- a/examples/quick/window/ScreenInfo.qml
+++ b/examples/quick/window/ScreenInfo.qml
@@ -80,10 +80,10 @@ Item {
         Text { text: Screen.width + "x" + Screen.height }
 
         Text { text: "pixel density" }
-        Text { text: Screen.pixelDensity.toFixed(2) + " dots/mm" }
+        Text { text: Screen.pixelDensity.toFixed(2) + " dots/mm (" + (Screen.pixelDensity * 25.4).toFixed(2) + " dots/inch)" }
 
         Text { text: "logical pixel density" }
-        Text { text: Screen.logicalPixelDensity.toFixed(2) + " dots/mm" }
+        Text { text: Screen.logicalPixelDensity.toFixed(2) + " dots/mm (" + (Screen.logicalPixelDensity * 25.4).toFixed(2) + " dots/inch)" }
 
         Text { text: "available virtual desktop" }
         Text { text: Screen.desktopAvailableWidth + "x" + Screen.desktopAvailableHeight }
diff --git a/examples/quick/window/window.qml b/examples/quick/window/window.qml
index 00daec7ff1..7bb2ce6cac 100644
--- a/examples/quick/window/window.qml
+++ b/examples/quick/window/window.qml
@@ -47,7 +47,7 @@ QtObject {
     property SystemPalette palette: SystemPalette { }
 
     property var controlWindow: Window {
-        width: 400
+        width: visibilityLabel.implicitWidth * 1.2
         height: col.implicitHeight + defaultSpacing * 2
         color: palette.window
         title: "Control Window"
@@ -122,6 +122,7 @@ QtObject {
                 return "unknown";
             }
             Text {
+                id: visibilityLabel
                 text: "second window is " + (testWindow.visible ? "visible" : "invisible") +
                       " and has visibility " + parent.visibilityToString(testWindow.visibility)
             }