diff options
| -rw-r--r-- | examples/multimedia/video/doc/src/qmlvideo.qdoc | 4 | ||||
| -rw-r--r-- | examples/multimedia/video/doc/src/qmlvideofx.qdoc | 4 | ||||
| -rw-r--r-- | src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc (renamed from examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc) | 6 | ||||
| -rw-r--r-- | src/multimedia/doc/src/images/video-qml-paint-rate.png (renamed from examples/multimedia/video/doc/images/video-qml-paint-rate.png) | bin | 6350 -> 6350 bytes |
4 files changed, 7 insertions, 7 deletions
diff --git a/examples/multimedia/video/doc/src/qmlvideo.qdoc b/examples/multimedia/video/doc/src/qmlvideo.qdoc index 359d07156..0f4de6ce5 100644 --- a/examples/multimedia/video/doc/src/qmlvideo.qdoc +++ b/examples/multimedia/video/doc/src/qmlvideo.qdoc @@ -129,13 +129,13 @@ instance, the embedded \section1 Calculating and displaying QML painting rate -\input video-qml-paint-rate.qdocinc +\input multimedia/doc/src/examples/video-qml-paint-rate.qdocinc All that remains is to connect the afterRendering() signal of the QQuickView object to a JavaScript function, which will eventually call frequencyItem.notify(): \quotefromfile multimedia/video/qmlvideo/main.cpp -\skipto QmlApplicationViewer +\skipto QGuiApplication \printuntil ; \dots \skipto QQuickItem diff --git a/examples/multimedia/video/doc/src/qmlvideofx.qdoc b/examples/multimedia/video/doc/src/qmlvideofx.qdoc index b6535a952..a3b7c01a2 100644 --- a/examples/multimedia/video/doc/src/qmlvideofx.qdoc +++ b/examples/multimedia/video/doc/src/qmlvideofx.qdoc @@ -203,13 +203,13 @@ And here is the effect selection menu: \section1 Calculating and displaying QML painting rate -\input video-qml-paint-rate.qdocinc +\input multimedia/doc/src/examples/video-qml-paint-rate.qdocinc All that remains is to connect the afterRendering() signal of the QQuickView object to a JavaScript function, which will eventually call frequencyItem.notify(): \quotefromfile multimedia/video/qmlvideofx/main.cpp -\skipto QmlApplicationViewer +\skipto QGuiApplication \printuntil ; \dots \skipto QQuickItem diff --git a/examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc b/src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc index 84098e241..860f14270 100644 --- a/examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc +++ b/src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc @@ -2,7 +2,7 @@ The QML painting rate is calculated by the FrequencyMonitor class, which turns a stream of events (received via the notify() slot), into an instantaneous and an averaged frequency: -\quotefromfile video/snippets/frequencymonitor/frequencymonitor.h +\quotefromfile multimedia/video/snippets/frequencymonitor/frequencymonitor.h \skipto class FrequencyMonitor : public QObject \printuntil Q_OBJECT \skipto Q_PROPERTY(qreal instantaneousFrequency @@ -19,13 +19,13 @@ instantaneous and an averaged frequency: The FrequencyMonitor class is exposed to QML like this -\quotefromfile video/snippets/frequencymonitor/frequencymonitordeclarative.cpp +\quotefromfile multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp \skipto FrequencyMonitor::qmlRegisterType \printuntil } and its data is displayed by defining a QML item called FrequencyItem, like this: -\quotefromfile video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml +\quotefromfile multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml \skipto import FrequencyMonitor \printuntil id: root \dots diff --git a/examples/multimedia/video/doc/images/video-qml-paint-rate.png b/src/multimedia/doc/src/images/video-qml-paint-rate.png Binary files differindex 1519ff64e..1519ff64e 100644 --- a/examples/multimedia/video/doc/images/video-qml-paint-rate.png +++ b/src/multimedia/doc/src/images/video-qml-paint-rate.png |
