Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Play whole file in spectrum analyzer demo
  Do not unnecessarily reset state of spectrum demo
  Set SpectrumAnalyserThread parent to 0 before calling moveToThread()
  Avoid being killed by graphics out-of-memory monitor.
  Revert function renaming in QtOpenVG.
  Support tactile feedback in QWidgets from QS60Style
  Support tactile feeedback from QS60Style for QWidgets
  Making the buttons less finger unfriendly
  Readded .def file entries after a little stunt
  Do not crash on Symbian
  Temporarily remove .def file entries for a little stunt
  Fixed crash with QClipboard in Symbian^3
  Fallback to vgWritePixels in drawPixmap.

1 files changed, 2 insertions, 2 deletions

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
     }
 }