Doc: Moved the qdocinc and image to the sourcedirs

QDoc parses the \input command relative to the sourcedirs
and not exampledirs. So I had to move the qdocinc file and
the corresponding image to the sourcedirs.

Task-number: QTBUG-28727
Change-Id: Ie064f0b79ab8ffcb0587b43ff4508f5865a321a9
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

4 files changed, 4 insertions, 47 deletions

diff --git a/examples/multimedia/video/doc/images/video-qml-paint-rate.png b/examples/multimedia/video/doc/images/video-qml-paint-rate.png
deleted file mode 100644
index 1519ff64e..000000000
--- a/examples/multimedia/video/doc/images/video-qml-paint-rate.png
+++ /dev/null
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/examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc
deleted file mode 100644
index 84098e241..000000000
--- a/examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-\skipto class FrequencyMonitor : public QObject
-\printuntil Q_OBJECT
-\skipto Q_PROPERTY(qreal instantaneousFrequency
-\printuntil averageFrequencyChanged)
-\skipto public
-\printuntil :
-\dots
-\skipto static void qmlRegisterType
-\printuntil ;
-\skipto public slots
-\printuntil notify();
-\skipto };
-\printline };
-
-The FrequencyMonitor class is exposed to QML like this
-
-\quotefromfile 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
-\skipto import FrequencyMonitor
-\printuntil id: root
-\dots
-\skipto function notify
-\printuntil id: monitor
-\skipto onAverageFrequencyChanged
-\printuntil {
-\skipto averageFrequencyText
-\printuntil /^\}/
-
-The result looks like this:
-
-\image video-qml-paint-rate.png
-
-