Merge remote branch 'qt/master' into file-engine-refactor

Conflicts:
	demos/declarative/minehunt/minehunt.pro
	src/corelib/io/io.pri
	src/corelib/io/qfsfileengine.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/io/qfsfileengine_win.cpp
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtDeclarativeu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtDeclarativeu.def
	src/s60installs/eabi/QtGuiu.def
	tests/auto/qapplication/test/test.pro
	tests/auto/qaudioinput/qaudioinput.pro
	tests/auto/qaudiooutput/qaudiooutput.pro
	tests/auto/qchar/qchar.pro
	tests/auto/qdiriterator/qdiriterator.pro
	tests/auto/qsound/qsound.pro

9 files changed, 133 insertions, 104 deletions

diff --git a/demos/declarative/minehunt/minehunt.cpp b/demos/declarative/minehunt/minehunt.cpp
index 9c82f30..aaaaaac 100644
--- a/demos/declarative/minehunt/minehunt.cpp
+++ b/demos/declarative/minehunt/minehunt.cpp
@@ -195,6 +195,7 @@ bool MinehuntGame::flip(int row, int col)
         won = false;
         hasWonChanged();
         setPlaying(false);
+        return true;
     }
 
     remaining--;
@@ -202,6 +203,7 @@ bool MinehuntGame::flip(int row, int col)
         won = true;
         hasWonChanged();
         setPlaying(false);
+        return true;
     }
     return true;
 }
@@ -209,7 +211,7 @@ bool MinehuntGame::flip(int row, int col)
 bool MinehuntGame::flag(int row, int col)
 {
     TileData *t = tile(row, col);
-    if(!t)
+    if(!t || !playing || t->flipped())
         return false;
 
     t->setHasFlag(!t->hasFlag());
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 4cf1441..d23bb05 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -1,7 +1,6 @@
 TEMPLATE = app
 TARGET  = minehunt
 QT += declarative
-CONFIG += qt plugin
 
 # Input
 HEADERS += minehunt.h
@@ -18,7 +17,7 @@ symbian:{
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
-    qmlminehuntfiles.sources = MinehuntCore minehunt.qml
+    qmlminehuntfiles.files = MinehuntCore minehunt.qml
     DEPLOYMENT += qmlminehuntfiles
 }
- 
\ No newline at end of file
+ 
diff --git a/demos/declarative/samegame/SamegameCore/Button.qml b/demos/declarative/samegame/SamegameCore/Button.qml
index 7fb7b65..140b196 100644
--- a/demos/declarative/samegame/SamegameCore/Button.qml
+++ b/demos/declarative/samegame/SamegameCore/Button.qml
@@ -48,7 +48,7 @@ Rectangle {
 
     signal clicked
 
-    width: buttonLabel.width + 20; height: buttonLabel.height + 6
+    width: buttonLabel.width + 20; height: buttonLabel.height + 20
     smooth: true
     border { width: 1; color: Qt.darker(activePalette.button) }
     radius: 8
@@ -70,6 +70,6 @@ Rectangle {
     MouseArea { id: mouseArea; anchors.fill: parent; onClicked: container.clicked() }
 
     Text {
-        id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText
+        id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText; font.pixelSize: 24
     }
 }
diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js
index 9266767..e618a10 100755
--- a/demos/declarative/samegame/SamegameCore/samegame.js
+++ b/demos/declarative/samegame/SamegameCore/samegame.js
@@ -9,12 +9,14 @@ var scoresURL = "";
 var gameDuration;
 var component = Qt.createComponent(blockSrc);
 
-//Index function used instead of a 2D array
-function index(column,row) {
-    return column + (row * maxColumn);
+// Index function used instead of a 2D array
+function index(column, row)
+{
+    return column + row * maxColumn;
 }
 
-function timeStr(msecs) {
+function timeStr(msecs)
+{
     var secs = Math.floor(msecs/1000);
     var m = Math.floor(secs/60);
     var ret = "" + m + "m " + (secs%60) + "s";
@@ -23,47 +25,48 @@ function timeStr(msecs) {
 
 function startNewGame()
 {
-    //Delete blocks from previous game
-    for(var i = 0; i<maxIndex; i++){
-        if(board[i] != null)
+    // Delete blocks from previous game
+    for (var i = 0; i < maxIndex; i++) {
+        if (board[i] != null)
             board[i].destroy();
     }
 
-    //Calculate board size
+    // Calculate board size
     maxColumn = Math.floor(gameCanvas.width/gameCanvas.blockSize);
     maxRow = Math.floor(gameCanvas.height/gameCanvas.blockSize);
-    maxIndex = maxRow*maxColumn;
+    maxIndex = maxRow * maxColumn;
 
-    //Close dialogs
+    // Close dialogs
     nameInputDialog.forceClose();
     dialog.forceClose();
 
-    //Initialize Board
+    // Initialize Board
     board = new Array(maxIndex);
     gameCanvas.score = 0;
-    for(var column=0; column<maxColumn; column++){
-        for(var row=0; row<maxRow; row++){
-            board[index(column,row)] = null;
-            createBlock(column,row);
+    for (var column = 0; column < maxColumn; column++) {
+        for (var row = 0; row < maxRow; row++) {
+            board[index(column, row)] = null;
+            createBlock(column, row);
         }
     }
     gameDuration = new Date();
 }
 
-var fillFound;//Set after a floodFill call to the number of blocks found
-var floodBoard;//Set to 1 if the floodFill reaches off that node
-//NOTE: Be careful with vars named x,y, as the calling object's x,y are still in scope
+var fillFound;  // Set after a floodFill call to the number of blocks found
+var floodBoard; // Set to 1 if the floodFill reaches off that node
+
+// NOTE: Be careful with vars named x,y, as the calling object's x,y are still in scope
 function handleClick(x,y)
 {
     var column = Math.floor(x/gameCanvas.blockSize);
     var row = Math.floor(y/gameCanvas.blockSize);
-    if(column >= maxColumn || column < 0 || row >= maxRow || row < 0)
+    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
         return;
-    if(board[index(column, row)] == null)
+    if (board[index(column, row)] == null)
         return;
-    //If it's a valid block, remove it and all connected (does nothing if it's not connected)
+    // If it's a valid block, remove it and all connected (does nothing if it's not connected)
     floodFill(column,row, -1);
-    if(fillFound <= 0)
+    if (fillFound <= 0)
         return;
     gameCanvas.score += (fillFound - 1) * (fillFound - 1);
     shuffleDown();
@@ -72,65 +75,65 @@ function handleClick(x,y)
 
 function floodFill(column,row,type)
 {
-    if(board[index(column, row)] == null)
+    if (board[index(column, row)] == null)
         return;
     var first = false;
-    if(type == -1){
+    if (type == -1) {
         first = true;
         type = board[index(column,row)].type;
-        
-        //Flood fill initialization
+
+        // Flood fill initialization
         fillFound = 0;
         floodBoard = new Array(maxIndex);
     }
-    if(column >= maxColumn || column < 0 || row >= maxRow || row < 0)
+    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
         return;
-    if(floodBoard[index(column, row)] == 1 || (!first && type != board[index(column,row)].type))
+    if (floodBoard[index(column, row)] == 1 || (!first && type != board[index(column, row)].type))
         return;
     floodBoard[index(column, row)] = 1;
-    floodFill(column+1,row,type);
-    floodFill(column-1,row,type);
-    floodFill(column,row+1,type);
-    floodFill(column,row-1,type);
-    if(first==true && fillFound == 0)
-        return;//Can't remove single blocks
-    board[index(column,row)].dying = true;
-    board[index(column,row)] = null;
+    floodFill(column + 1, row, type);
+    floodFill(column - 1, row, type);
+    floodFill(column, row + 1, type);
+    floodFill(column, row - 1, type);
+    if (first == true && fillFound == 0)
+        return; // Can't remove single blocks
+    board[index(column, row)].dying = true;
+    board[index(column, row)] = null;
     fillFound += 1;
 }
 
 function shuffleDown()
 {
-    //Fall down
-    for(var column=0; column<maxColumn; column++){
+    // Fall down
+    for (var column = 0; column < maxColumn; column++) {
         var fallDist = 0;
-        for(var row=maxRow-1; row>=0; row--){
-            if(board[index(column,row)] == null){
+        for (var row = maxRow - 1; row >= 0; row--) {
+            if (board[index(column,row)] == null) {
                 fallDist += 1;
-            }else{
-                if(fallDist > 0){
-                    var obj = board[index(column,row)];
-                    obj.y = (row+fallDist) * gameCanvas.blockSize;
-                    board[index(column,row+fallDist)] = obj;
-                    board[index(column,row)] = null;
+            } else {
+                if (fallDist > 0) {
+                    var obj = board[index(column, row)];
+                    obj.y = (row + fallDist) * gameCanvas.blockSize;
+                    board[index(column, row + fallDist)] = obj;
+                    board[index(column, row)] = null;
                 }
             }
         }
     }
-    //Fall to the left
+    // Fall to the left
     fallDist = 0;
-    for(column=0; column<maxColumn; column++){
-        if(board[index(column, maxRow - 1)] == null){
+    for (column = 0; column < maxColumn; column++) {
+        if (board[index(column, maxRow - 1)] == null) {
             fallDist += 1;
-        }else{
-            if(fallDist > 0){
-                for(row=0; row<maxRow; row++){
-                    obj = board[index(column,row)];
-                    if(obj == null)
+        } else {
+            if (fallDist > 0) {
+                for (row = 0; row < maxRow; row++) {
+                    obj = board[index(column, row)];
+                    if (obj == null)
                         continue;
-                    obj.x = (column-fallDist) * gameCanvas.blockSize;
-                    board[index(column-fallDist,row)] = obj;
-                    board[index(column,row)] = null;
+                    obj.x = (column - fallDist) * gameCanvas.blockSize;
+                    board[index(column - fallDist,row)] = obj;
+                    board[index(column, row)] = null;
                 }
             }
         }
@@ -139,58 +142,59 @@ function shuffleDown()
 
 function victoryCheck()
 {
-    //awards bonuses for no blocks left
+    // Awards bonuses for no blocks left
     var deservesBonus = true;
-    for(var column=maxColumn-1; column>=0; column--)
-        if(board[index(column, maxRow - 1)] != null)
+    for (var column = maxColumn - 1; column >= 0; column--)
+        if (board[index(column, maxRow - 1)] != null)
             deservesBonus = false;
-    if(deservesBonus)
+    if (deservesBonus)
         gameCanvas.score += 500;
-    //Checks for game over
-    if(deservesBonus || !(floodMoveCheck(0,maxRow-1, -1))){
+    // Checks for game over
+    if (deservesBonus || !(floodMoveCheck(0, maxRow - 1, -1))) {
         gameDuration = new Date() - gameDuration;
         nameInputDialog.show("You won! Please enter your name:                 ");
         nameInputDialog.initialWidth = nameInputDialog.text.width + 20;
-        if(nameInputDialog.name == "")
+        if (nameInputDialog.name == "")
             nameInputDialog.width = nameInputDialog.initialWidth;
-        nameInputDialog.text.opacity = 0;//Just a spacer
+        nameInputDialog.text.opacity = 0; // Just a spacer
     }
 }
 
-//only floods up and right, to see if it can find adjacent same-typed blocks 
+// Only floods up and right, to see if it can find adjacent same-typed blocks
 function floodMoveCheck(column, row, type)
 {
-    if(column >= maxColumn || column < 0 || row >= maxRow || row < 0)
+    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
         return false;
-    if(board[index(column, row)] == null)
+    if (board[index(column, row)] == null)
         return false;
     var myType = board[index(column, row)].type;
-    if(type == myType)
+    if (type == myType)
         return true;
     return floodMoveCheck(column + 1, row, myType) ||
-           floodMoveCheck(column, row - 1, board[index(column,row)].type);
+           floodMoveCheck(column, row - 1, board[index(column, row)].type);
 }
 
-function createBlock(column,row){
+function createBlock(column,row)
+{
     // Note that we don't wait for the component to become ready. This will
     // 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){
+    if (component.status == Component.Ready) {
         var dynamicObject = component.createObject(gameCanvas);
-        if(dynamicObject == null){
+        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.x = column * gameCanvas.blockSize;
+        dynamicObject.y = row * gameCanvas.blockSize;
         dynamicObject.width = gameCanvas.blockSize;
         dynamicObject.height = 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;
@@ -198,23 +202,35 @@ function createBlock(column,row){
     return true;
 }
 
-function saveHighScore(name) {
-    if(scoresURL!="")
+function saveHighScore(name)
+{
+    if (scoresURL != "")
         sendHighScore(name);
-    //OfflineStorage
-    var db = openDatabaseSync("SameGameScores", "1.0", "Local SameGame High Scores",100);
+    // Offline storage
+    var db = openDatabaseSync(
+        "SameGameScores",
+        "1.0",
+        "Local SameGame High Scores",
+        100
+    );
     var dataStr = "INSERT INTO Scores VALUES(?, ?, ?, ?)";
-    var data = [name, gameCanvas.score, maxColumn+"x"+maxRow ,Math.floor(gameDuration/1000)];
+    var data = [
+        name,
+        gameCanvas.score,
+        maxColumn + "x" + maxRow,
+        Math.floor(gameDuration / 1000)
+    ];
     db.transaction(
         function(tx) {
             tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(name TEXT, score NUMBER, gridSize TEXT, time NUMBER)');
             tx.executeSql(dataStr, data);
 
-            //Only show results for the current grid size
-            var rs = tx.executeSql('SELECT * FROM Scores WHERE gridSize = "'+maxColumn+"x"+maxRow+'" ORDER BY score desc LIMIT 10');
+            // Only show results for the current grid size
+            var rs = tx.executeSql('SELECT * FROM Scores WHERE gridSize = "'
+                + maxColumn + "x" + maxRow + '" ORDER BY score desc LIMIT 10');
             var r = "\nHIGH SCORES for this grid size\n\n"
-            for(var i = 0; i < rs.rows.length; i++){
-                r += (i+1)+". " + rs.rows.item(i).name +' got '
+            for (var i = 0; i < rs.rows.length; i++) {
+                r += (i+1) + ". " + rs.rows.item(i).name + ' got '
                     + rs.rows.item(i).score + ' points in '
                     + rs.rows.item(i).time + ' seconds.\n';
             }
@@ -223,13 +239,15 @@ function saveHighScore(name) {
     );
 }
 
-function sendHighScore(name) {
+function sendHighScore(name)
+{
     var postman = new XMLHttpRequest()
-    var postData = "name="+name+"&score="+gameCanvas.score
-        +"&gridSize="+maxColumn+"x"+maxRow +"&time="+Math.floor(gameDuration/1000);
+    var postData = "name=" + name + "&score=" + gameCanvas.score
+        + "&gridSize=" + maxColumn + "x" + maxRow
+        + "&time=" + Math.floor(gameDuration / 1000);
     postman.open("POST", scoresURL, true);
     postman.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-    postman.onreadystatechange = function() { 
+    postman.onreadystatechange = function() {
         if (postman.readyState == postman.DONE) {
             dialog.show("Your score has been uploaded.");
         }
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index f66c40e..ab49c04 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -92,9 +92,7 @@ Rectangle {
             enabled: nameInputDialog.initialWidth != 0
         }
 
-        onOpened: nameInputText.focus = true;
         onClosed: {
-            nameInputText.focus = false;
             if (nameInputText.text != "")
                 Logic.saveHighScore(nameInputText.text);
         }
@@ -116,7 +114,7 @@ Rectangle {
         TextInput {
             id: nameInputText
             anchors { verticalCenter: parent.verticalCenter; left: dialogText.right }
-            focus: false
+            focus: visible
             autoScroll: false
             maximumLength: 24
             onTextChanged: {
@@ -133,7 +131,7 @@ Rectangle {
 
     Rectangle {
         id: toolBar
-        width: parent.width; height: 32
+        width: parent.width; height: 58
         color: activePalette.window
         anchors.bottom: screen.bottom
 
@@ -156,6 +154,7 @@ Rectangle {
             anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter }
             text: "Score: " + gameCanvas.score
             font.bold: true
+            font.pixelSize: 24
             color: activePalette.windowText
         }
     }
diff --git a/demos/declarative/snake/content/pics/pause.png b/demos/declarative/snake/content/pics/pause.png
new file mode 100644
index 0000000..056d97d
--- /dev/null
+++ b/demos/declarative/snake/content/pics/pause.png
diff --git a/demos/declarative/snake/content/snake.js b/demos/declarative/snake/content/snake.js
index 2a99aa8..837b82a 100644
--- a/demos/declarative/snake/content/snake.js
+++ b/demos/declarative/snake/content/snake.js
@@ -39,7 +39,7 @@ function startNewGame()
         return;
     }
 
-    if (heartbeat.running) {
+    if (activeGame) {
         endGame();
         startNewGameTimer.running = true;
         return;
@@ -93,7 +93,7 @@ function startNewGame()
 
 function endGame()
 {
-    heartbeat.running = false;
+    activeGame = false;
     for(var i in snake)
         snake[i].dying = true;
     if (cookie) {
diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 5cbf1be..585c0b2 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -47,6 +47,7 @@ Rectangle {
     id: screen;
     SystemPalette { id: activePalette }
     color: activePalette.window
+    property bool activeGame: false
 
     property int gridSize : 34
     property int margin: 4
@@ -75,6 +76,7 @@ Rectangle {
     Timer {
         id: heartbeat;
         interval: heartbeatInterval;
+        running: activeGame && runtime.isActiveWindow
         repeat: true
         onTriggered: { Logic.move() }
     }
@@ -94,7 +96,16 @@ Rectangle {
     Timer {
         id: startHeartbeatTimer;
         interval: 1000 ;
-        onTriggered: { state = "running"; heartbeat.running = true;}
+        onTriggered: { state = "running"; activeGame = true; }
+    }
+
+    Image{
+        id: pauseDialog
+        z: 1
+        source: "content/pics/pause.png"
+        anchors.centerIn: parent;
+        //opacity is deliberately not animated
+        opacity: activeGame && !runtime.isActiveWindow
     }
 
     Image {
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index 4495523..74bab37 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -78,7 +78,7 @@ Item {
             id: views
             x: 2; width: parent.width - 4
             y:60 //Below the title bars
-            height: 380
+            height: parent.height - 100
 
             Text {
                 id:title