Merge branch 'master' of ../qt-qml-staging

14 files changed, 45 insertions, 34 deletions

diff --git a/demos/browser/networkaccessmanager.cpp b/demos/browser/networkaccessmanager.cpp
index 9e717bb..c63c0eb 100644
--- a/demos/browser/networkaccessmanager.cpp
+++ b/demos/browser/networkaccessmanager.cpp
@@ -64,7 +64,7 @@
 NetworkAccessManager::NetworkAccessManager(QObject *parent)
     : QNetworkAccessManager(parent),
     requestFinishedCount(0), requestFinishedFromCacheCount(0), requestFinishedPipelinedCount(0),
-    requestFinishedSecureCount(0)
+    requestFinishedSecureCount(0), requestFinishedDownloadBufferCount(0)
 {
     connect(this, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)),
             SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*)));
@@ -106,14 +106,19 @@ void NetworkAccessManager::requestFinished(QNetworkReply *reply)
     if (reply->attribute(QNetworkRequest::ConnectionEncryptedAttribute).toBool() == true)
         requestFinishedSecureCount++;
 
+    if (reply->attribute(QNetworkRequest::DownloadBufferAttribute).isValid() == true)
+        requestFinishedDownloadBufferCount++;
+
     if (requestFinishedCount % 10)
         return;
 
     double pctCached = (double(requestFinishedFromCacheCount) * 100.0/ double(requestFinishedCount));
     double pctPipelined = (double(requestFinishedPipelinedCount) * 100.0/ double(requestFinishedCount));
     double pctSecure = (double(requestFinishedSecureCount) * 100.0/ double(requestFinishedCount));
+    double pctDownloadBuffer = (double(requestFinishedDownloadBufferCount) * 100.0/ double(requestFinishedCount));
+
 #ifdef QT_DEBUG
-    qDebug("STATS [%lli requests total] [%3.2f%% from cache] [%3.2f%% pipelined] [%3.2f%% SSL/TLS]", requestFinishedCount, pctCached, pctPipelined, pctSecure);
+    qDebug("STATS [%lli requests total] [%3.2f%% from cache] [%3.2f%% pipelined] [%3.2f%% SSL/TLS] [%3.2f%% Zerocopy]", requestFinishedCount, pctCached, pctPipelined, pctSecure, pctDownloadBuffer);
 #endif
 }
 
diff --git a/demos/browser/networkaccessmanager.h b/demos/browser/networkaccessmanager.h
index 76fc198..d6e6ede 100644
--- a/demos/browser/networkaccessmanager.h
+++ b/demos/browser/networkaccessmanager.h
@@ -60,6 +60,7 @@ private:
     qint64 requestFinishedFromCacheCount;
     qint64 requestFinishedPipelinedCount;
     qint64 requestFinishedSecureCount;
+    qint64 requestFinishedDownloadBufferCount;
 
 public slots:
     void loadSettings();
diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 13f228d..441bfb9 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -46,7 +46,7 @@ import "Core/calculator.js" as CalcEngine
 Rectangle {
     id: window
 
-    width: 480; height: 360
+    width: 360; height: 480
     color: "#282828"
 
     property string rotateLeft: "\u2939"
@@ -63,7 +63,15 @@ Rectangle {
         id: main
         state: "orientation " + runtime.orientation
 
-        width: parent.width; height: parent.height; anchors.centerIn: parent
+        property bool landscapeWindow: window.width > window.height 
+        property real baseWidth: landscapeWindow ? window.height : window.width
+        property real baseHeight: landscapeWindow ? window.width : window.height
+        property real rotationDelta: landscapeWindow ? -90 : 0
+
+        rotation: rotationDelta
+        width: main.baseWidth
+        height: main.baseHeight
+        anchors.centerIn: parent
 
         Column {
             id: box; spacing: 8
@@ -132,24 +140,20 @@ Rectangle {
         states: [
             State {
                 name: "orientation " + Orientation.Landscape
-                PropertyChanges { target: main; rotation: 90; width: window.height; height: window.width }
-                PropertyChanges { target: rotateButton; operation: rotateLeft }
+                PropertyChanges { target: main; rotation: 90 + rotationDelta; width: main.baseHeight; height: main.baseWidth }
             },
             State {
                 name: "orientation " + Orientation.PortraitInverted
-                PropertyChanges { target: main; rotation: 180; }
-                PropertyChanges { target: rotateButton; operation: rotateRight }
+                PropertyChanges { target: main; rotation: 180 + rotationDelta; }
             },
             State {
                 name: "orientation " + Orientation.LandscapeInverted
-                PropertyChanges { target: main; rotation: 270; width: window.height; height: window.width }
-                PropertyChanges { target: rotateButton; operation: rotateLeft }
+                PropertyChanges { target: main; rotation: 270 + rotationDelta; width: main.baseHeight; height: main.baseWidth }
             }
         ]
 
         transitions: Transition {
             SequentialAnimation {
-                PropertyAction { target: rotateButton; property: "operation" }
                 RotationAnimation { direction: RotationAnimation.Shortest; duration: 300; easing.type: Easing.InOutQuint  }
                 NumberAnimation { properties: "x,y,width,height"; duration: 300; easing.type: Easing.InOutQuint }
             }
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 11470a8..e0af466 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -62,7 +62,7 @@ Item {
 
             GridView {
                 id: photoGridView; model: rssModel; delegate: Mobile.GridDelegate {}
-                cacheBuffer: 100
+                cacheBuffer: 1000
                 cellWidth: (parent.width-2)/4; cellHeight: cellWidth; width: parent.width; height: parent.height
             }
 
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml
index 1a69c95..026689b 100644
--- a/demos/declarative/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/minehunt.qml
@@ -104,7 +104,7 @@ Item {
         anchors.centerIn: parent; width: parent.width - 20
         horizontalAlignment: Text.AlignHCenter
         wrapMode: Text.WordWrap
-        text: "Minehunt will not run properly if the C++ plugin is not compiled.\n\nPlease see README."
+        text: "Minehunt demo has to be compiled to run.\n\nPlease see README."
         color: "white"; font.bold: true; font.pixelSize: 14
         visible: tiles == undefined
     }
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index 73b8fa7..dcb1112 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 1.1
 import "script/script.js" as Script
 
 Package {
@@ -61,7 +61,7 @@ Package {
 
             BorderImage {
                 anchors {
-                    fill: border.visible ? border : placeHolder
+                    fill: originalImage.status == Image.Ready ? border : placeHolder
                     leftMargin: -6; topMargin: -6; rightMargin: -8; bottomMargin: -8
                 }
                 source: 'images/box-shadow.png'; smooth: true
@@ -88,11 +88,11 @@ Package {
             }
             BusyIndicator { anchors.centerIn: parent; on: originalImage.status != Image.Ready }
             Image {
-                id: originalImage; smooth: true; source: "http://" + Script.getImagePath(content)
+                id: originalImage; smooth: true; source: "http://" + Script.getImagePath(content); cache: false
                 fillMode: Image.PreserveAspectFit; width: photoWrapper.width; height: photoWrapper.height
             }
             Image {
-                id: hqImage; smooth: true; source: ""; visible: false
+                id: hqImage; smooth: true; source: ""; visible: false; cache: false
                 fillMode: Image.PreserveAspectFit; width: photoWrapper.width; height: photoWrapper.height
             }
             Binding {
diff --git a/demos/declarative/samegame/SamegameCore/BoomBlock.qml b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
index da51230..009aeca 100644
--- a/demos/declarative/samegame/SamegameCore/BoomBlock.qml
+++ b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 1.1
 import Qt.labs.particles 1.0
 
 Item {
diff --git a/demos/declarative/samegame/SamegameCore/Button.qml b/demos/declarative/samegame/SamegameCore/Button.qml
index aea4e53..b2b232c 100644
--- a/demos/declarative/samegame/SamegameCore/Button.qml
+++ b/demos/declarative/samegame/SamegameCore/Button.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 1.1
 
 Rectangle {
     id: container
diff --git a/demos/declarative/samegame/SamegameCore/Dialog.qml b/demos/declarative/samegame/SamegameCore/Dialog.qml
index b11c65c..ecac475 100644
--- a/demos/declarative/samegame/SamegameCore/Dialog.qml
+++ b/demos/declarative/samegame/SamegameCore/Dialog.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 1.1
 
 Rectangle {
     id: page
diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js
index 16c48c4..d7b827a 100755
--- a/demos/declarative/samegame/SamegameCore/samegame.js
+++ b/demos/declarative/samegame/SamegameCore/samegame.js
@@ -185,21 +185,22 @@ function createBlock(column,row)
     // only work if the block QML is a local file. Otherwise the component will
     // not be ready immediately. There is a statusChanged signal on the
     // component you could use if you want to wait to load remote files.
-    if (component.status == Component.Ready) {
-        var dynamicObject = component.createObject(gameCanvas);
-        if (dynamicObject == null) {
+    if(component.status == Component.Ready){
+        var dynamicObject = component.createObject(gameCanvas,
+                {"type": Math.floor(Math.random() * 3),
+                "x": column*gameCanvas.blockSize,
+                "width": gameCanvas.blockSize,
+                "height": gameCanvas.blockSize});
+        if(dynamicObject == null){
             console.log("error creating block");
             console.log(component.errorString());
             return false;
         }
-        dynamicObject.type = Math.floor(Math.random() * 3);
-        dynamicObject.x = column * gameCanvas.blockSize;
-        dynamicObject.y = row * gameCanvas.blockSize;
-        dynamicObject.width = gameCanvas.blockSize;
-        dynamicObject.height = gameCanvas.blockSize;
+        dynamicObject.y = row*gameCanvas.blockSize;
         dynamicObject.spawned = true;
-        board[index(column, row)] = dynamicObject;
-    } else {
+
+        board[index(column,row)] = dynamicObject;
+    }else{
         console.log("error loading block component");
         console.log(component.errorString());
         return false;
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index ebb8e4a..ab64156 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 1.1
 import "SamegameCore"
 import "SamegameCore/samegame.js" as Logic
 
diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 7565058..d81ce9e 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -105,7 +105,7 @@ Rectangle {
         source: "content/pics/pause.png"
         anchors.centerIn: parent;
         //opacity is deliberately not animated
-        opacity: activeGame && !runtime.isActiveWindow
+        opacity: activeGame && !Qt.application.active
     }
 
     Image {
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index 737d11f..947b843 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -128,7 +128,7 @@ Flickable {
                         if (!heuristicZoom(clickX,clickY,2.5)) {
                             var zf = flickable.width / contentsSize.width
                             if (zf >= contentsScale)
-                                zf = 2.0/zoomFactor // zoom in (else zooming out)
+                                zf = 2.0*contentsScale // zoom in (else zooming out)
                             doZoom(zf,clickX*zf,clickY*zf)
                          }
                        }
diff --git a/demos/qmediaplayer/qmediaplayer.pro b/demos/qmediaplayer/qmediaplayer.pro
index f8f81ad..a7a6181 100644
--- a/demos/qmediaplayer/qmediaplayer.pro
+++ b/demos/qmediaplayer/qmediaplayer.pro
@@ -33,7 +33,7 @@ symbian {
 
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 
-	LIBS += -lCommDb
+	LIBS += -lcommdb
 
     TARGET.CAPABILITY="NetworkServices"
 }