summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/multimedia/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml1
-rw-r--r--examples/multimedia/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml1
-rw-r--r--src/imports/multimedia/Video.qml4
-rw-r--r--src/qtmultimediaquicktools/qdeclarativevideooutput.cpp4
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