diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2014-05-08 23:47:38 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-12 12:26:40 +0200 |
| commit | 1d6872ae9c2de1ae7501c375b4960b1ac9374693 (patch) | |
| tree | b9cd07acd3738e70fe14daceb4a39c4b1dc68979 | |
| parent | 364258abfcc438f79908e8c47fd0fd68cfecee36 (diff) | |
| download | qtmultimedia-1d6872ae9c2de1ae7501c375b4960b1ac9374693.tar.gz | |
Doc: Clean up references to Qt System Info
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>
4 files changed, 10 insertions, 0 deletions
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml index efc657cfc..01ed95e8a 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml @@ -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 { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml index f36b2b14f..362386bc4 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml @@ -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 { diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml index 0b8dc1118..9da808462 100644 --- a/src/imports/multimedia/Video.qml +++ b/src/imports/multimedia/Video.qml @@ -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 diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp index b13665f66..e904307df 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp @@ -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 |