summaryrefslogtreecommitdiffstats
path: root/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-02-19 17:14:43 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-02-19 17:15:56 +0100
commitd396262bc9771cacbc71e79215768984fa1974ff (patch)
treee029399524feabed6ebe0ee1e010af9f5e58932d /src/multimedia/doc/src/qtmultimedia-cpp.qdoc
parent0ce2cb3ebe6289e3db14438560fa186d9e5186b8 (diff)
parent2db2cde0d8433ad1aed59412717c4cddf496ba66 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: src/multimedia/doc/qtmultimedia.qdocconf src/plugins/blackberry/mediaplayer/bbmetadata.cpp src/plugins/blackberry/mediaplayer/bbmetadata.h tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
Diffstat (limited to 'src/multimedia/doc/src/qtmultimedia-cpp.qdoc')
-rw-r--r--src/multimedia/doc/src/qtmultimedia-cpp.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
index 938ffc3cb..3405143e5 100644
--- a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
@@ -30,7 +30,7 @@
\title Qt Multimedia C++ Classes
\ingroup modules
- \brief The \l {Qt Multimedia}{QtMultimedia} module provides audio, video, radio and camera functionality.
+ \brief The \l {Qt Multimedia} module provides audio, video, radio and camera functionality.
The C++ classes provide more control over the multimedia content than the QML alternatives.
If your application is serving complex use cases such as decoding media files, accessing video or audio buffers,