diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-13 08:36:00 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-13 08:36:00 (GMT) |
| commit | 03a55630cfccf7f6ed01d865c541e07afb25c96e (patch) | |
| tree | 25b4fe750bccad037068ca043b700db0b2cceef4 /src/multimedia | |
| parent | 8e309899b8287b67905072927df1e00effc2a13e (diff) | |
| parent | de20fdfb1da72d2ad89689f46f8412c04c25fc96 (diff) | |
| download | Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.zip Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.tar.gz Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/video/qabstractvideobuffer.cpp | 1 | ||||
| -rw-r--r-- | src/multimedia/video/qabstractvideosurface.cpp | 1 | ||||
| -rw-r--r-- | src/multimedia/video/qvideoframe.cpp | 1 | ||||
| -rw-r--r-- | src/multimedia/video/qvideosurfaceformat.cpp | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp index 22b36f2..465a1e7 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/video/qabstractvideobuffer.cpp @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE /*! \class QAbstractVideoBuffer \brief The QAbstractVideoBuffer class is an abstraction for video data. - \preliminary \since 4.6 The QVideoFrame class makes use of a QAbstractVideoBuffer internally to reference a buffer of diff --git a/src/multimedia/video/qabstractvideosurface.cpp b/src/multimedia/video/qabstractvideosurface.cpp index 3f6bc08..3dabb6b 100644 --- a/src/multimedia/video/qabstractvideosurface.cpp +++ b/src/multimedia/video/qabstractvideosurface.cpp @@ -46,7 +46,6 @@ QT_BEGIN_NAMESPACE /*! \class QAbstractVideoSurface \brief The QAbstractVideoSurface class is a base class for video presentation surfaces. - \preliminary \since 4.6 The QAbstractVideoSurface class defines the standard interface that video producers use to diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index f10ce97..2d66d9e 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -102,7 +102,6 @@ private: /*! \class QVideoFrame \brief The QVideoFrame class provides a representation of a frame of video data. - \preliminary \since 4.6 A QVideoFrame encapsulates the data of a video frame, and information about the frame. diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp index 6b16e6a..1fc13a6 100644 --- a/src/multimedia/video/qvideosurfaceformat.cpp +++ b/src/multimedia/video/qvideosurfaceformat.cpp @@ -136,7 +136,6 @@ public: \class QVideoSurfaceFormat \brief The QVideoSurfaceFormat class specifies the stream format of a video presentation surface. - \preliminary \since 4.6 A video surface presents a stream of video frames. The surface's format describes the type of |