Fixed some bugs for Qt5.2

Change-Id: If4f47ac17c697730885fc8c749293466185fdfe1
Reviewed-by: Lasse Räihä <lasse.raiha@digia.com>
Reviewed-by: Kimmo Ollila <kimmo.ollila@digia.com>

6 files changed, 9 insertions, 15 deletions

diff --git a/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml b/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml
index e2b3bb0..00b6c72 100644
--- a/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml
+++ b/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml
@@ -239,22 +239,22 @@ function drawPointer(context, angle, len, thickness, color){
                 }
                 context.closePath()
 
+                context.strokeStyle = "#222222"
                 context.beginPath()
 
                 var romans = ['I','II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X', 'XI', 'XII']
-
                 for (i=1; i<=12; i++){
                     x1=Math.cos((-90+(i)*30)*0.01745)*clockContainer.clockRadius*.35 -clockContainer.width*0.03
                     y1=Math.sin((-90+(i)*30)*0.01745)*clockContainer.clockRadius*.35 +clockContainer.height*0.04
 
                     if (root.dialStyle === 1) x1-=clockContainer.width*0.01
 
-                    context.font = 'bold '+Math.floor(clockContainer.width*.1)+'px Arial'
+                    context.font = 'bold '+Math.floor(clockContainer.width*.07)+'px sans-serif'
 
 
                     if (i >= 10)
                         x1 -= clockContainer.width*0.02
-                    context.textAlign = 'center';
+                    context.textAlign = 'right';
                     context.textBaseline  = 'middle'
 
                     var dial = i
diff --git a/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml b/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml
index b0c2047..162364b 100644
--- a/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml
+++ b/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml
@@ -86,7 +86,7 @@ Rectangle {
             anchors.bottom: parent.bottom

             color: "Black"

             opacity: 0.5

-            visible: iconImage.source

+            visible: iconImage.source !== ""

 

         }

 

diff --git a/QtDemo/qml/QtDemo/demos/radio/channels.xml b/QtDemo/qml/QtDemo/demos/radio/channels.xml
index 99522ab..0dac5c9 100644
--- a/QtDemo/qml/QtDemo/demos/radio/channels.xml
+++ b/QtDemo/qml/QtDemo/demos/radio/channels.xml
@@ -5,10 +5,6 @@
             <url>http://vpr.streamguys.net/vpr24.mp3</url>
         </channel>
         <channel>
-            <title>CBC Music Hard Rock</title>
-            <url>http://2903.live.streamtheworld.com:80/CBC_HAROCK_H_SC.mp3</url>
-        </channel>
-        <channel>
             <title>"JPR Classics"</title>
             <url>http://jpr.streamguys.org:80/jpr-classics</url>
         </channel>
diff --git a/QtDemo/qml/QtDemo/demos/radio/radio.qml b/QtDemo/qml/QtDemo/demos/radio/radio.qml
index 8615f9b..8dd0423 100644
--- a/QtDemo/qml/QtDemo/demos/radio/radio.qml
+++ b/QtDemo/qml/QtDemo/demos/radio/radio.qml
@@ -100,22 +100,20 @@ FocusScope {
                 }
                 border {width:1; color: "#888888"}
                 radius: height/2
+                clip: true
 
 
                 PathView {
-                    enabled: root.activeFocus
+                    //enabled: root.activeFocus
                     id: stationList
                     anchors.fill:parent
                     anchors.leftMargin: parent.height*.9
                     model: stationModel
-                    pathItemCount: 6
-                    clip: true
                     property int openedIndex: -1
 
                     onMovementStarted: {
                         idleTimer.stop()
                         openedIndex = -1
-                        pathItemCount = 5
                     }
                     onMovementEnded: idleTimer.restart()
 
diff --git a/QtDemo/qml/QtDemo/demos/touchgallery/content/TabBarPage.qml b/QtDemo/qml/QtDemo/demos/touchgallery/content/TabBarPage.qml
index c96314b..7651a3c 100644
--- a/QtDemo/qml/QtDemo/demos/touchgallery/content/TabBarPage.qml
+++ b/QtDemo/qml/QtDemo/demos/touchgallery/content/TabBarPage.qml
@@ -80,11 +80,11 @@ Item {
                     anchors.fill: parent
                     border.bottom: 8
                     border.top: 8
-                    source: tab.selected ? "../images/tab_selected.png":"../images/tabs_standard.png"
+                    source: styleData.selected ? "../images/tab_selected.png":"../images/tabs_standard.png"
                     Text {
                         anchors.centerIn: parent
                         color: "white"
-                        text: tab.title.toUpperCase()
+                        text: styleData.title.toUpperCase()
                         font.pixelSize: 16
                     }
                     Rectangle {
diff --git a/QtDemo/qml/QtDemo/demos/touchgallery/main.qml b/QtDemo/qml/QtDemo/demos/touchgallery/main.qml
index 95d737b..ad8fbef 100644
--- a/QtDemo/qml/QtDemo/demos/touchgallery/main.qml
+++ b/QtDemo/qml/QtDemo/demos/touchgallery/main.qml
@@ -81,7 +81,7 @@ CustomAppWindow {
         }
 
         Text {
-            font.pixelSize: app.height*.07
+            font.pixelSize: app.height*.06
             Behavior on x { NumberAnimation{ easing.type: Easing.OutCubic} }
             x: backButton.x + backButton.width + 20
             anchors.verticalCenter: parent.verticalCenter