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/video/qvideoframe.cpp | |
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/video/qvideoframe.cpp')
-rw-r--r-- | src/multimedia/video/qvideoframe.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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. |