Fixed images and fonts.

Change-Id: I3b5873c00490c125ceb8635410d29e457bd0552b
Reviewed-by: Kimmo Ollila <kimmo.ollila@digia.com>

10 files changed, 4 insertions, 4 deletions

diff --git a/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml b/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml
index 037c502..b976c25 100644
--- a/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml
+++ b/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml
@@ -64,7 +64,7 @@ Rectangle {
             width: parent.width;

             wrapMode: Text.WordWrap;

             smooth: true

-            font { family: mainWindow.uiFont; pointSize: mainWindow.tileFontSize }

+            font { family: mainWindow.uiFont; pixelSize: mainWindow.tileFontSize }

         }

     }

 }

diff --git a/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml b/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml
index a79249a..5f7126e 100644
--- a/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml
+++ b/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml
@@ -7,7 +7,7 @@ Rectangle {
     color: appBackground

 

     property int tileHeight: parseInt(grid.height / 3)

-    property int tileFontSize: tileHeight * 0.05

+    property int tileFontSize: tileHeight * 0.08

     property int horizontalMargin: height * 0.08

     property int topBarsize: height * 0.2

     property int bottomBarSize: height * 0.08

diff --git a/QtDemo/qml/QtDemo/demos/video/VideoDelegate.qml b/QtDemo/qml/QtDemo/demos/video/VideoDelegate.qml
index aa5a3cb..d600ddb 100644
--- a/QtDemo/qml/QtDemo/demos/video/VideoDelegate.qml
+++ b/QtDemo/qml/QtDemo/demos/video/VideoDelegate.qml
@@ -64,7 +64,7 @@ Item {
             width: parent.width;
             wrapMode: Text.WordWrap;
             smooth: true
-            font { family: videoSelector.uiFont; pointSize: videoSelector.tileFontSize }
+            font { family: videoSelector.uiFont; pixelSize: videoSelector.tileFontSize }
         }
     }
 }
diff --git a/QtDemo/qml/QtDemo/demos/video/VideoSelector.qml b/QtDemo/qml/QtDemo/demos/video/VideoSelector.qml
index 564f1ed..635ef9b 100644
--- a/QtDemo/qml/QtDemo/demos/video/VideoSelector.qml
+++ b/QtDemo/qml/QtDemo/demos/video/VideoSelector.qml
@@ -6,7 +6,7 @@ Item {
 
     property int tileHeight: parseInt(grid.height / 2)
     property int tileMargin: tileHeight * 0.1
-    property int tileFontSize: tileHeight * 0.05
+    property int tileFontSize: tileHeight * 0.08
     property string tileBackground: "#262626"
     property string textColor: "white"
     property string uiFont: "Segoe UI"
diff --git a/QtDemo/qml/QtDemo/images/laptop2_s.png b/QtDemo/qml/QtDemo/images/laptop2_s.png
deleted file mode 100644
index b17c39e..0000000
--- a/QtDemo/qml/QtDemo/images/laptop2_s.png
+++ /dev/null
diff --git a/QtDemo/qml/QtDemo/images/medical_device.png b/QtDemo/qml/QtDemo/images/medical_device.png
index 41b6965..50814a6 100644
--- a/QtDemo/qml/QtDemo/images/medical_device.png
+++ b/QtDemo/qml/QtDemo/images/medical_device.png
diff --git a/QtDemo/qml/QtDemo/images/phone2.png b/QtDemo/qml/QtDemo/images/phone2.png
index 310d7b0..df997d1 100644
--- a/QtDemo/qml/QtDemo/images/phone2.png
+++ b/QtDemo/qml/QtDemo/images/phone2.png
diff --git a/QtDemo/qml/QtDemo/images/phone3.png b/QtDemo/qml/QtDemo/images/phone3.png
index db5bfb6..66cb130 100644
--- a/QtDemo/qml/QtDemo/images/phone3.png
+++ b/QtDemo/qml/QtDemo/images/phone3.png
diff --git a/QtDemo/qml/QtDemo/images/tablet1.png b/QtDemo/qml/QtDemo/images/tablet1.png
index 2e4406b..5a80680 100644
--- a/QtDemo/qml/QtDemo/images/tablet1.png
+++ b/QtDemo/qml/QtDemo/images/tablet1.png
diff --git a/QtDemo/qml/QtDemo/images/tv.png b/QtDemo/qml/QtDemo/images/tv.png
index 6c10149..1454cde 100644
--- a/QtDemo/qml/QtDemo/images/tv.png
+++ b/QtDemo/qml/QtDemo/images/tv.png