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

Doc: Moved the qdocinc and image to the sourcedirs

Browse Source 
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>
This commit is contained in:
Venugopal Shivashankar
2012-12-19 14:36:55 +01:00
committed by The Qt Project
parent 3df5999a07
commit 85faa55780
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/multimedia/video/doc/src/qmlvideo.qdoc
View File

@@ -129,13 +129,13 @@ instance, the embedded
\section1 Calculating and displaying QML painting rate \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 All that remains is to connect the afterRendering() signal of the QQuickView
object to a JavaScript function, which will eventually call frequencyItem.notify(): object to a JavaScript function, which will eventually call frequencyItem.notify():
\quotefromfile multimedia/video/qmlvideo/main.cpp \quotefromfile multimedia/video/qmlvideo/main.cpp
\skipto QmlApplicationViewer \skipto QGuiApplication
\printuntil ; \printuntil ;
\dots \dots
\skipto QQuickItem \skipto QQuickItem

4
examples/multimedia/video/doc/src/qmlvideofx.qdoc
View File

@@ -203,13 +203,13 @@ And here is the effect selection menu:
\section1 Calculating and displaying QML painting rate \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 All that remains is to connect the afterRendering() signal of the QQuickView
object to a JavaScript function, which will eventually call frequencyItem.notify(): object to a JavaScript function, which will eventually call frequencyItem.notify():
\quotefromfile multimedia/video/qmlvideofx/main.cpp \quotefromfile multimedia/video/qmlvideofx/main.cpp
\skipto QmlApplicationViewer \skipto QGuiApplication
\printuntil ; \printuntil ;
\dots \dots
\skipto QQuickItem \skipto QQuickItem

6
examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc → src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc
View File

@@ -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 turns a stream of events (received via the notify() slot), into an
instantaneous and an averaged frequency: instantaneous and an averaged frequency:
\quotefromfile video/snippets/frequencymonitor/frequencymonitor.h \quotefromfile multimedia/video/snippets/frequencymonitor/frequencymonitor.h
\skipto class FrequencyMonitor : public QObject \skipto class FrequencyMonitor : public QObject
\printuntil Q_OBJECT \printuntil Q_OBJECT
\skipto Q_PROPERTY(qreal instantaneousFrequency \skipto Q_PROPERTY(qreal instantaneousFrequency
@@ -19,13 +19,13 @@ instantaneous and an averaged frequency:
The FrequencyMonitor class is exposed to QML like this 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 \skipto FrequencyMonitor::qmlRegisterType
\printuntil } \printuntil }
and its data is displayed by defining a QML item called FrequencyItem, like this: 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 \skipto import FrequencyMonitor
\printuntil id: root \printuntil id: root
\dots \dots

0
examples/multimedia/video/doc/images/video-qml-paint-rate.png → src/multimedia/doc/src/images/video-qml-paint-rate.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB