Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

10 files changed, 1 insertions, 21 deletions

diff --git a/demos/declarative/samegame/README b/demos/declarative/samegame/README
deleted file mode 100644
index 244b205..0000000
--- a/demos/declarative/samegame/README
+++ /dev/null
@@ -1,10 +0,0 @@
-This demo uses pictures from the KDE project (www.kde.org),
-specifically the images from the KSame game. These images are
-
-background.png
-blueStone.png
-redStone.png
-greenStone.png
-yellowStone.png
-
-and are presumably under the same GPL2 license as the rest of kdegames
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml
index c7af666..275ad43 100644
--- a/examples/declarative/fonts/fonts.qml
+++ b/examples/declarative/fonts/fonts.qml
@@ -8,7 +8,7 @@ Rectangle {
 
     FontLoader { id: fixedFont; name: "Courier" }
 
-    FontLoader { id: localFont; source: "fonts/FreeMono.ttf" }
+    FontLoader { id: localFont; source: "fonts/tarzenau-ocr-a.ttf" }
 
     FontLoader { id: webFont; source: "http://www.princexml.com/fonts/steffmann/Starburst.ttf" }
     FontLoader { id: webFont2; source: "http://wrong.address.org" }
diff --git a/examples/declarative/fonts/fonts/FreeMono.ttf b/examples/declarative/fonts/fonts/FreeMono.ttf
deleted file mode 100644
index d7ce52d..0000000
--- a/examples/declarative/fonts/fonts/FreeMono.ttf
+++ /dev/null
diff --git a/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf b/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf
new file mode 100644
index 0000000..cf93f96
--- /dev/null
+++ b/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf
diff --git a/examples/declarative/tutorials/samegame/samegame4/README b/examples/declarative/tutorials/samegame/samegame4/README
deleted file mode 100644
index 244b205..0000000
--- a/examples/declarative/tutorials/samegame/samegame4/README
+++ /dev/null
@@ -1,10 +0,0 @@
-This demo uses pictures from the KDE project (www.kde.org),
-specifically the images from the KSame game. These images are
-
-background.png
-blueStone.png
-redStone.png
-greenStone.png
-yellowStone.png
-
-and are presumably under the same GPL2 license as the rest of kdegames
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png
index 25e885f..3734a27 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png
+++ b/examples/declarative/tutorials/samegame/samegame4/content/pics/background.png
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png
index bf342e0..20e43c7 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png
+++ b/examples/declarative/tutorials/samegame/samegame4/content/pics/blueStone.png
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png
index 5ac14a5..b568a19 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png
+++ b/examples/declarative/tutorials/samegame/samegame4/content/pics/greenStone.png
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png
index b099f60..36b09a2 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png
+++ b/examples/declarative/tutorials/samegame/samegame4/content/pics/redStone.png
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png b/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png
index c56124a..b1ce762 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png
+++ b/examples/declarative/tutorials/samegame/samegame4/content/pics/yellowStone.png