diff options
| author | axis <qt-info@nokia.com> | 2010-02-16 09:00:23 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-16 09:00:23 (GMT) |
| commit | 9d174f13e48730ac06aa429e0f011a02b333025e (patch) | |
| tree | 6075fa3c24880dd6fc548f03395a5809739f67de /src/multimedia/video/qvideosurfaceformat.cpp | |
| parent | 4790ab735f96a13027e7292ff5b49195224f0af9 (diff) | |
| parent | e024cc10a97b9518b2dd577175feb66258d7ac05 (diff) | |
| download | Qt-9d174f13e48730ac06aa429e0f011a02b333025e.zip Qt-9d174f13e48730ac06aa429e0f011a02b333025e.tar.gz Qt-9d174f13e48730ac06aa429e0f011a02b333025e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
Diffstat (limited to 'src/multimedia/video/qvideosurfaceformat.cpp')
| -rw-r--r-- | src/multimedia/video/qvideosurfaceformat.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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 |