Merge commit 'staging-1/4.7' into friday

4 files changed, 16 insertions, 14 deletions

diff --git a/examples/declarative/animation/easing/easing.qml b/examples/declarative/animation/easing/easing.qml
index 0089452..ffb129d 100644
--- a/examples/declarative/animation/easing/easing.qml
+++ b/examples/declarative/animation/easing/easing.qml
@@ -94,36 +94,37 @@ Rectangle {
         id: delegate
 
         Item {
-            height: 42; width: window.width
+            height: 56; width: window.width
 
             Text { text: name; anchors.centerIn: parent; color: "White" }
 
             Rectangle {
-                id: slot1; color: "#121212"; x: 30; height: 32; width: 32
-                border.color: "#343434"; border.width: 1; radius: 8
+                id: slot1; color: "#121212"; x: 30; height: 46; width: 46
+                border.color: "#343434"; border.width: 1; radius: 12
                 anchors.verticalCenter: parent.verticalCenter
             }
 
             Rectangle {
-                id: slot2; color: "#121212"; x: window.width - 62; height: 32; width: 32
-                border.color: "#343434"; border.width: 1; radius: 8
+                id: slot2; color: "#121212"; x: window.width - 76; height: 46; width: 46
+                border.color: "#343434"; border.width: 1; radius: 12
                 anchors.verticalCenter: parent.verticalCenter
             }
 
             Rectangle {
                 id: rect; x: 30; color: "#454545"
                 border.color: "White"; border.width: 2
-                height: 32; width: 32; radius: 8
+                height: 46; width: 46; radius: 12
                 anchors.verticalCenter: parent.verticalCenter
 
                 MouseArea {
                     onClicked: if (rect.state == '') rect.state = "right"; else rect.state = ''
                     anchors.fill: parent
+                    anchors.margins: -5 // Make MouseArea bigger than the rectangle, itself
                 }
 
                 states : State {
                     name: "right"
-                    PropertyChanges { target: rect; x: window.width - 62; color: ballColor }
+                    PropertyChanges { target: rect; x: window.width - 76; color: ballColor }
                 }
 
                 transitions: Transition {
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
index 56de2f6..ed8c7d6 100644
--- a/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
+++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
@@ -83,6 +83,7 @@ Rectangle {
 
             MouseArea {
                 anchors.fill: parent
+                anchors.margins: -16 // Increase mouse area a lot outside the slider
                 drag.target: parent; drag.axis: Drag.XAxis
                 drag.minimumX: 2; drag.maximumX: container.width - 32
             }
diff --git a/src/corelib/codecs/qtextcodec_symbian.cpp b/src/corelib/codecs/qtextcodec_symbian.cpp
index 322c146..18c5fd0 100644
--- a/src/corelib/codecs/qtextcodec_symbian.cpp
+++ b/src/corelib/codecs/qtextcodec_symbian.cpp
@@ -115,11 +115,11 @@ static const QSymbianCodecInitData codecsData[] = {
     { /*271082494*/ 271082494,                                   0, "gsm7_turkish_single\0" },
     { /*271082495*/ 271082495,                                   0, "turkish_locking_gsm7ext\0" },
     { /*271082496*/ 271082496,                                   0, "turkish_locking_single\0" },
-    { /*271082503*/ 271082503,                                   0, "portuguese_gsm7_single\0" },                              
-    { /*271082504*/ 271082504,                                   0, "portuguese_locking_gsm7ext\0" },                          
-    { /*271082505*/ 271082505,                                   0, "portuguese_locking_single\0" },                           
-    { /*271082506*/ 271082506,                                   0, "spanish_gsm7_single\0" },                                 
-    { /*271085624*/ 271085624,                                 114, "GB18030\0" },                                             
+    { /*271082503*/ 271082503,                                   0, "portuguese_gsm7_single\0" },
+    { /*271082504*/ 271082504,                                   0, "portuguese_locking_gsm7ext\0" },
+    { /*271082505*/ 271082505,                                   0, "portuguese_locking_single\0" },
+    { /*271082506*/ 271082506,                                   0, "spanish_gsm7_single\0" },
+    { /*271085624*/ 271085624,                                 114, "GB18030\0" },
     { /*536929574*/ 536929574,                                  38, "EUC-KR\0" },
     { /*536936703*/ 536936703,                                   0, "CP949\0" },
     { /*536936705*/ 536936705,                                  37, "ISO-2022-KR\0" },
@@ -667,7 +667,7 @@ QSymbianTextCodec *QSymbianTextCodec::init()
             // We did not find the charsetId in our codecsData[], therefore we ask
             // the OS for the codec name. We first try to get a "standard name" and fall
             // back to array->At(i).Name(), if really needed. array->At(i).Name() is not
-            // guaranteed to be a correct name for QTextCodec::codecFromName(). 
+            // guaranteed to be a correct name for QTextCodec::codecFromName().
             QScopedPointer<HBufC8> buf;
             QT_TRAP_THROWING(buf.reset(converter->ConvertCharacterSetIdentifierToStandardNameL(charsetId, qt_s60GetRFs())))
             QByteArray name;
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index d5f0d42..4869eba 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -978,7 +978,7 @@ void QDirectFBPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode m
         break;
     case QPainter::CompositionMode_SourceOver:
         compositionModeStatus &= ~PorterDuff_AlwaysBlend;
-        surface->SetPorterDuff(surface, DSPD_SRC_OVER);
+        surface->SetPorterDuff(surface, DSPD_NONE);
         break;
     case QPainter::CompositionMode_DestinationOver:
         surface->SetPorterDuff(surface, DSPD_DST_OVER);