slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Doc: Clean up references to Qt System Info

Browse Source 
The module is not released yet; the current documentation is misleading.

Change-Id: Ia20ac8e3504942f6f60b94264f3a12497e09da24
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Sze Howe Koh
2014-05-08 23:47:38 +08:00
committed by The Qt Project
parent 364258abfc
commit 1d6872ae9c
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/multimedia/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml
View File

@@ -41,6 +41,7 @@
import QtQuick 2.0
import QtSystemInfo 5.0
// NOTE: The QtSystemInfo module is not yet part of Qt 5
Item {
ScreenSaver {

1
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml
View File

@@ -41,6 +41,7 @@
import QtQuick 2.0
import QtMobility.systeminfo 1.1
// NOTE: The QtSystemInfo module is not yet part of Qt 5
Item {
ScreenSaver {

4
src/imports/multimedia/Video.qml
View File

@@ -85,6 +85,7 @@ import QtMultimedia 5.0
\sa MediaPlayer, VideoOutput
\omit
\section1 Screen Saver
If it is likely that an application will be playing video for an extended
@@ -97,8 +98,11 @@ import QtMultimedia 5.0
ScreenSaver { screenSaverEnabled: false }
\endqml
\endomit
*/
// TODO: Restore Qt System Info docs when the module is released
Item {
id: video

4
src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
View File

@@ -104,6 +104,7 @@ QT_BEGIN_NAMESPACE
\sa MediaPlayer, Camera
\omit
\section1 Screen Saver
If it is likely that an application will be playing video for an extended
@@ -116,8 +117,11 @@ QT_BEGIN_NAMESPACE
ScreenSaver { screenSaverEnabled: false }
\endqml
\endomit
*/
// TODO: Restore Qt System Info docs when the module is released
/*!
\internal
\class QDeclarativeVideoOutput