Merge remote branch 'qt/4.7' into lighthouse-4.7

Conflicts:
	src/gui/egl/egl.pri
	src/gui/painting/qwindowsurface_p.h

16 files changed, 6 insertions, 99 deletions

diff --git a/demos/declarative/flickr/common/LikeOMeter.qml b/demos/declarative/flickr/common/LikeOMeter.qml
deleted file mode 100644
index 17e3998..0000000
--- a/demos/declarative/flickr/common/LikeOMeter.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: container
-
-    property int rating: 2
-
-    Row {
-        Star {
-            rating: 0
-            onClicked: { container.rating = rating }
-            on: container.rating >= 0
-        }
-        Star {
-            rating: 1
-            onClicked: { container.rating = rating }
-            on: container.rating >= 1
-        }
-        Star {
-            rating: 2
-            onClicked: { container.rating = rating }
-            on: container.rating >= 2
-        }
-        Star {
-            rating: 3
-            onClicked: { container.rating = rating }
-            on: container.rating >= 3
-        }
-        Star {
-            rating: 4
-            onClicked: { container.rating = rating }
-            on: container.rating >= 4
-        }
-    }
-}
diff --git a/demos/declarative/flickr/common/Loading.qml b/demos/declarative/flickr/common/Loading.qml
deleted file mode 100644
index 8daed48..0000000
--- a/demos/declarative/flickr/common/Loading.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.7
-
-Image {
-    id: loading; source: "pics/loading.png"
-    NumberAnimation on rotation {
-        from: 0; to: 360; running: loading.visible == true; loops: Animation.Infinite; duration: 900
-    }
-}
diff --git a/demos/declarative/flickr/common/RssModel.qml b/demos/declarative/flickr/common/RssModel.qml
index d0960db..415a9e9 100644
--- a/demos/declarative/flickr/common/RssModel.qml
+++ b/demos/declarative/flickr/common/RssModel.qml
@@ -3,7 +3,12 @@ import Qt 4.7
 XmlListModel {
     property string tags : ""
 
-    source: "http://api.flickr.com/services/feeds/photos_public.gne?"+(tags ? "tags="+tags+"&" : "")+"format=rss2"
+    function commasep(x)
+    {
+        return x.replace(' ',',');
+    }
+
+    source: "http://api.flickr.com/services/feeds/photos_public.gne?"+(tags ? "tags="+commasep(tags)+"&" : "")+"format=rss2"
     query: "/rss/channel/item"
     namespaceDeclarations: "declare namespace media=\"http://search.yahoo.com/mrss/\";"
 
diff --git a/demos/declarative/flickr/common/Star.qml b/demos/declarative/flickr/common/Star.qml
deleted file mode 100644
index fcca742..0000000
--- a/demos/declarative/flickr/common/Star.qml
+++ /dev/null
@@ -1,45 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: container
-    width: 24
-    height: 24
-
-    property int rating
-    property bool on
-    signal clicked
-
-    Image {
-        id: starImage
-        source: "pics/ghns_star.png"
-        x: 6
-        y: 7
-        opacity: 0.4
-        scale: 0.5
-    }
-    MouseArea {
-        anchors.fill: container
-        onClicked: { container.clicked() }
-    }
-    states: [
-        State {
-            name: "on"
-            when: container.on == true
-            PropertyChanges {
-                target: starImage
-                opacity: 1
-                scale: 1
-                x: 1
-                y: 0
-            }
-        }
-    ]
-    transitions: [
-        Transition {
-            NumberAnimation {
-                properties: "opacity,scale,x,y"
-                easing.type: "OutBounce"
-            }
-        }
-    ]
-}
diff --git a/demos/declarative/flickr/common/pics/background.png b/demos/declarative/flickr/common/pics/background.png
deleted file mode 100644
index 5b37072..0000000
--- a/demos/declarative/flickr/common/pics/background.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/button-pressed.png b/demos/declarative/flickr/common/pics/button-pressed.png
deleted file mode 100644
index e434d32..0000000
--- a/demos/declarative/flickr/common/pics/button-pressed.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/button-pressed.sci b/demos/declarative/flickr/common/pics/button-pressed.sci
deleted file mode 100644
index b8db272..0000000
--- a/demos/declarative/flickr/common/pics/button-pressed.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 8
-border.top: 4
-border.bottom: 4
-border.right: 8
-source: button.png
diff --git a/demos/declarative/flickr/common/pics/button.png b/demos/declarative/flickr/common/pics/button.png
deleted file mode 100644
index 56a63ce..0000000
--- a/demos/declarative/flickr/common/pics/button.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/button.sci b/demos/declarative/flickr/common/pics/button.sci
deleted file mode 100644
index b8db272..0000000
--- a/demos/declarative/flickr/common/pics/button.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 8
-border.top: 4
-border.bottom: 4
-border.right: 8
-source: button.png
diff --git a/demos/declarative/flickr/common/pics/ghns_star.png b/demos/declarative/flickr/common/pics/ghns_star.png
deleted file mode 100644
index 4ad43cc..0000000
--- a/demos/declarative/flickr/common/pics/ghns_star.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/loading.png b/demos/declarative/flickr/common/pics/loading.png
deleted file mode 100644
index 47a1589..0000000
--- a/demos/declarative/flickr/common/pics/loading.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/reflection.png b/demos/declarative/flickr/common/pics/reflection.png
deleted file mode 100644
index c143a48..0000000
--- a/demos/declarative/flickr/common/pics/reflection.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/shadow-bottom.png b/demos/declarative/flickr/common/pics/shadow-bottom.png
deleted file mode 100644
index 523f6e7..0000000
--- a/demos/declarative/flickr/common/pics/shadow-bottom.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/shadow-corner.png b/demos/declarative/flickr/common/pics/shadow-corner.png
deleted file mode 100644
index ef8c856..0000000
--- a/demos/declarative/flickr/common/pics/shadow-corner.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/shadow-right-screen.png b/demos/declarative/flickr/common/pics/shadow-right-screen.png
deleted file mode 100644
index 9856c4f..0000000
--- a/demos/declarative/flickr/common/pics/shadow-right-screen.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/shadow-right.png b/demos/declarative/flickr/common/pics/shadow-right.png
deleted file mode 100644
index f534a35..0000000
--- a/demos/declarative/flickr/common/pics/shadow-right.png
+++ /dev/null