diff options
Diffstat (limited to 'basicsuite/mediaplayer')
-rwxr-xr-x | basicsuite/mediaplayer/ControlBar.qml | 2 | ||||
-rwxr-xr-x | basicsuite/mediaplayer/ImageButton.qml | 2 | ||||
-rw-r--r-- | basicsuite/mediaplayer/Intro.qml | 2 | ||||
-rw-r--r-- | basicsuite/mediaplayer/MetadataView.qml | 2 | ||||
-rwxr-xr-x | basicsuite/mediaplayer/PlaybackControl.qml | 2 | ||||
-rwxr-xr-x | basicsuite/mediaplayer/SeekControl.qml | 2 | ||||
-rw-r--r-- | basicsuite/mediaplayer/Slider.qml | 2 | ||||
-rw-r--r-- | basicsuite/mediaplayer/UrlBar.qml | 2 | ||||
-rwxr-xr-x | basicsuite/mediaplayer/VolumeControl.qml | 2 | ||||
-rw-r--r-- | basicsuite/mediaplayer/description.txt | 4 | ||||
-rw-r--r-- | basicsuite/mediaplayer/exclude.txt | 4 |
11 files changed, 14 insertions, 12 deletions
diff --git a/basicsuite/mediaplayer/ControlBar.qml b/basicsuite/mediaplayer/ControlBar.qml index a3d0ae2..b6c1b9e 100755 --- a/basicsuite/mediaplayer/ControlBar.qml +++ b/basicsuite/mediaplayer/ControlBar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/ImageButton.qml b/basicsuite/mediaplayer/ImageButton.qml index 3644f37..6dcb6dd 100755 --- a/basicsuite/mediaplayer/ImageButton.qml +++ b/basicsuite/mediaplayer/ImageButton.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/Intro.qml b/basicsuite/mediaplayer/Intro.qml index 5e1332f..094fe3e 100644 --- a/basicsuite/mediaplayer/Intro.qml +++ b/basicsuite/mediaplayer/Intro.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/MetadataView.qml b/basicsuite/mediaplayer/MetadataView.qml index 4d45b75..c9a9ccf 100644 --- a/basicsuite/mediaplayer/MetadataView.qml +++ b/basicsuite/mediaplayer/MetadataView.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/PlaybackControl.qml b/basicsuite/mediaplayer/PlaybackControl.qml index f83f358..65bb7ca 100755 --- a/basicsuite/mediaplayer/PlaybackControl.qml +++ b/basicsuite/mediaplayer/PlaybackControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/SeekControl.qml b/basicsuite/mediaplayer/SeekControl.qml index 19a1fb7..9a75517 100755 --- a/basicsuite/mediaplayer/SeekControl.qml +++ b/basicsuite/mediaplayer/SeekControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/Slider.qml b/basicsuite/mediaplayer/Slider.qml index da9732f..20a3aa7 100644 --- a/basicsuite/mediaplayer/Slider.qml +++ b/basicsuite/mediaplayer/Slider.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/UrlBar.qml b/basicsuite/mediaplayer/UrlBar.qml index c3cd648..5da4d64 100644 --- a/basicsuite/mediaplayer/UrlBar.qml +++ b/basicsuite/mediaplayer/UrlBar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/VolumeControl.qml b/basicsuite/mediaplayer/VolumeControl.qml index 62375f1..9844350 100755 --- a/basicsuite/mediaplayer/VolumeControl.qml +++ b/basicsuite/mediaplayer/VolumeControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/description.txt b/basicsuite/mediaplayer/description.txt index bf034e5..0868473 100644 --- a/basicsuite/mediaplayer/description.txt +++ b/basicsuite/mediaplayer/description.txt @@ -1,3 +1,3 @@ -The Media Player example demonstrates the use of the media playback features of Qt Multimedia with Qt Quick. +The Media Player example demonstrates the use of media playback features provided by Qt Multimedia with Qt Quick. -It can play from a file or from Internet, both videos and music. +It can play content either from a file or a network source, both videos and music. diff --git a/basicsuite/mediaplayer/exclude.txt b/basicsuite/mediaplayer/exclude.txt index 952c994..9e012dd 100644 --- a/basicsuite/mediaplayer/exclude.txt +++ b/basicsuite/mediaplayer/exclude.txt @@ -1 +1,3 @@ -android-beagleboard: +android-beaglebone +android-emulator +linux-beaglebone |