summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraavit <eirik.aavitsland@digia.com>2013-10-09 17:41:03 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-10-10 16:28:38 +0300
commit9c48ce0535c7a89e32a4b0f932dc3f61e973018a (patch)
tree54a3f0f9a20e0067a1c7aad68a580b579d92491e
parent926985dea77120cc901a595bc53d4701b668a1d9 (diff)
Add some sample videos for the Media Player
Change-Id: I9d978f40f8a2047b04f32211c1bb429d2a46151a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
-rw-r--r--basicsuite/Media Player/FileBrowser.qml2
-rw-r--r--videos/big-buck-bunny_trailer.webmbin0 -> 2165175 bytes
-rw-r--r--videos/introducing_qt5.mp4bin0 -> 21588882 bytes
3 files changed, 1 insertions, 1 deletions
diff --git a/basicsuite/Media Player/FileBrowser.qml b/basicsuite/Media Player/FileBrowser.qml
index 33d14cf..f9f2f81 100644
--- a/basicsuite/Media Player/FileBrowser.qml
+++ b/basicsuite/Media Player/FileBrowser.qml
@@ -46,7 +46,7 @@ Rectangle {
id: fileBrowser
color: "transparent"
- property string folder: "file:///cache"
+ property string folder: "file:///data/videos"
signal fileSelected(string file)
diff --git a/videos/big-buck-bunny_trailer.webm b/videos/big-buck-bunny_trailer.webm
new file mode 100644
index 0000000..6a17395
--- /dev/null
+++ b/videos/big-buck-bunny_trailer.webm
Binary files differ
diff --git a/videos/introducing_qt5.mp4 b/videos/introducing_qt5.mp4
new file mode 100644
index 0000000..c7cc2da
--- /dev/null
+++ b/videos/introducing_qt5.mp4
Binary files differ