Docs: fix qml links and standalone build for Multimedia

Change-Id: Ia3f1e49aef203911bb5cf1ee062c9100be213b38
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

8 files changed, 46 insertions, 604 deletions

diff --git a/doc/src/examples/camera.qdoc b/doc/src/examples/camera.qdoc
index deb13826a..4bc172098 100644
--- a/doc/src/examples/camera.qdoc
+++ b/doc/src/examples/camera.qdoc
@@ -53,9 +53,9 @@ interface object.
 The Camera constructor does some basic initialization. The camera object is
 set to '0', the user interface is initialized and UI signal are connected to
 slots that react to the triggering event. However, most of the work is done when
-the \e {setCamera()} function is called, passing in a \l {QByteArray}.
+the \e{setCamera()} function is called, passing in a \l {QByteArray}.
 
-\e {setCamera()} sets up various connections between the user interface and the functionality
+\e{setCamera()} sets up various connections between the user interface and the functionality
 of the Camera class using signals and slots. It also instantiates and initializes the \l {QCamera},
 \l {QCameraImageCapture} and \l {QMediaRecorder} objects mentioned above. The still
 and video recording visual tabs are enabled and finally the
@@ -65,10 +65,10 @@ Now that the camera is ready for user commands it waits for a suitable event.
 Such an event will be the key press of either the \l {Qt::Key_CameraFocus} or
 \l {Qt::Key_Camera} buttons on the application window. Camera focus will
 simply display the viewfinder and lock the camera settings. Key_Camera will
-either call \e {takeImage()} if the \l {QCamera::captureMode()}{captureMode()}
+either call \e{takeImage()} if the \l {QCamera::captureMode()}{captureMode()}
 is QCamera::CaptureStillImage, or if the capture mode is for video then one
 of two actions will occur. If the recording state shows that we are currently
-recording then the \e {stop()} function is called resulting in a call to
+recording then the \e{stop()} function is called resulting in a call to
 \l {QCamera::stop()}, whereas if we are not recording then a video recording
 is started with a call to \l {QMediaRecorder::record()}.
 
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
deleted file mode 100644
index 7b43c695c..000000000
--- a/doc/src/legal/3rdparty.qdoc
+++ /dev/null
@@ -1,300 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \page 3rdparty.html
-
-    \title Third-Party Licenses Used in Qt
-    \ingroup licensing
-    \brief License information for third-party libraries supplied with Qt.
-
-    Qt includes a number of third-party libraries that are used to provide
-    certain features. Unlike the code described in the
-    \l{Other Licenses Used in Qt}{code used in Qt} document, these
-    libraries are supplied alongside the Qt modules.
-
-    Third Party Software may impose additional restrictions and it is the
-    user's responsibility to ensure that they have met the licensing
-    requirements of the GPL, LGPL, or Qt Commercial license and the relevant
-    license of the Third Party Software they are using.
-
-    Run \c{configure -help} to see any options that may be available for
-    controlling the use of these libraries.
-
-    \tableofcontents
-
-    \section1 DES (\c des.cpp)
-
-    \e {Implementation of DES encryption for NTLM\br
-    Copyright 1997-2005 Simon Tatham.\br
-    This software is released under the MIT license.}
-
-    See \c src/3rdparty/des/des.cpp for more information about the terms and
-    conditions under which the code is supplied.
-
-    \section1 FreeType 2 (\c freetype) version 2.3.6
-
-    \e {The FreeType project is a team of volunteers who develop free, portable
-    and high-quality software solutions for digital typography. We specifically
-    target embedded systems and focus on bringing small, efficient and
-    ubiquitous products.} -- quoted from \c 3rdparty/freetype/docs/freetype2.html.
-
-    See \c src/3rdparty/freetype/docs/FTL.txt and \c
-    src/3rdparty/freetype/docs/GPL.txt for license details.
-
-    See also the files in \c src/3rdparty/harfbuzz, which are used by
-    FreeType.
-
-    Parts of the FreeType projects have been modified and put into Qt
-    for use in the painting subsystem. These files are ftraster.h,
-    ftraster.c, ftgrays.h and ftgrays.c. The following modifications
-    has been made to these files:
-
-    \list
-    \o Renamed FT_ and ft_ symbols to QT_FT_ and qt_ft_ to avoid name
-    conflicts.
-    \o Removed parts of code not relevant when compiled with
-    _STANDALONE_ defined.
-    \o Changed behavior in ftraster.c to follow X polygon filling
-    rules.
-    \o Implemented support in ftraster.c for winding / odd even
-    polygon fill rules.
-    \o Replaced bitmap generation with span generation in ftraster.c
-    \o Renamed: ftraster.h to qblackraster_p.h
-    \o Renamed: ftraster.c to qblackraster.c
-    \o Renamed: ftgrays.h to qgrayraster_p.h
-    \o Renamed: ftgrays.c to qgrayraster.c
-    \endlist
-
-    \section1 HarfBuzz (\c harfbuzz)
-
-    \e {This is HarfBuzz, an OpenType Layout engine.}
-
-    \e {It was derived originally from the OpenType code in FreeType-1.x, ported to
-    FreeType2.  (This code has been abandoned for FreeType2, but until something
-    better comes along, should serve our purposes.) In addition to porting to
-    FreeType-2, it has been modified in various other ways.} -- quoted from
-    \c src/3rdparty/harfbuzz/README.
-
-    See \c src/3rdparty/harfbuzz/COPYING.FTL and src/3rdparty/harfbuzz/COPYING.GPL
-    for license details.
-
-    \section1 The Independent JPEG Group's JPEG Software (\c libjpeg) version 6b
-
-    \e {This package contains C software to implement JPEG image compression and
-    decompression.  JPEG (pronounced "jay-peg") is a standardized compression
-    method for full-color and gray-scale images.  JPEG is intended for compressing
-    "real-world" scenes; line drawings, cartoons and other non-realistic images
-    are not its strong suit.  JPEG is lossy, meaning that the output image is not
-    exactly identical to the input image.} -- quoted from \c
-    src/3rdparty/libjpeg/README.
-
-    See \c src/3rdparty/libjpeg/README for license details.
-
-    \section1 MD4 (\c md4.cpp and \c md4.h)
-
-    \e {MD4 (RFC-1320) message digest.\br
-    Modified from MD5 code by Andrey Panin <pazke@donpac.ru>\br\br
-    Written by Solar Designer <solar@openwall.com> in 2001, and placed in\br
-    the public domain.  There's absolutely no warranty.}
-
-    See \c src/3rdparty/md4/md4.cpp and \c src/3rdparty/md4/md4.h for more
-    information about the terms and conditions under which the code is
-    supplied.
-
-    \section1 MD5 (\c md5.cpp and \c md5.h)
-
-    \e {This code implements the MD5 message-digest algorithm.
-    The algorithm is due to Ron Rivest.  This code was
-    written by Colin Plumb in 1993, no copyright is claimed.
-    This code is in the public domain; do with it what you wish.} -- quoted from
-    \c src/3rdparty/md5/md5.h
-
-    See \c src/3rdparty/md5/md5.cpp and \c src/3rdparty/md5/md5.h for more
-    information about the terms and conditions under which the code is
-    supplied.
-
-    \section1 MNG Library (\c libmng) version 1.0.10
-
-    \e {The libmng library supports decoding, displaying, encoding, and various
-    other manipulations of the Multiple-image Network Graphics (MNG) format
-    image files. It uses the zlib compression library, and optionally the
-    JPEG library by the Independant JPEG Group (IJG) and/or
-    lcms (little cms), a color-management library by Marti Maria Saguer.}
-    -- quoted from \c src/3rdparty/libmng/doc/libmng.txt
-
-    See \c src/3rdparty/libmng/LICENSE for license details.
-
-    \section1 PNG Reference Library (\c libpng) version 1.2.29
-
-    \e {Libpng was written as a companion to the PNG specification, as a way
-    of reducing the amount of time and effort it takes to support the PNG
-    file format in application programs.} -- quoted from \c
-    src/3rdparty/libpng/libpng.txt.
-
-    See \c src/3rdparty/libpng/LICENSE for license details.
-
-    \section1 The ptmalloc memory allocator (\c ptmalloc3) version 1.8
-
-    \e ptmcalloc3 is a scalable concurrent memory allocator suitable
-    for use in multi-threaded programs.
-
-    \hr
-
-    Copyright (c) 2001-2006 Wolfram Gloger
-
-    Permission to use, copy, modify, distribute, and sell this software
-    and its documentation for any purpose is hereby granted without fee,
-    provided that (i) the above copyright notices and this permission
-    notice appear in all copies of the software and related documentation,
-    and (ii) the name of Wolfram Gloger may not be used in any advertising
-    or publicity relating to the software.
-
-    THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-    WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-    IN NO EVENT SHALL WOLFRAM GLOGER BE LIABLE FOR ANY SPECIAL,
-    INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY
-    DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-    WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY
-    OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-
-    \hr
-
-    See \c src/3rdparty/ptmalloc/COPYRIGHT for license details.
-
-    \section1 SHA-1 (\c sha1.cpp)
-
-    \e {Based on the public domain implementation of the SHA-1 algorithm\br
-    Copyright (C) Dominik Reichl <dominik.reichl@t-online.de>}
-
-    See \c src/3rdparty/sha1/sha1.cpp for more information about the terms and
-    conditions under which the code is supplied.
-
-    \section1 SQLite (\c sqlite) version 3.5.9
-
-    \e {SQLite is a small C library that implements a
-    self-contained, embeddable, zero-configuration SQL database engine.}
-    -- quoted from \l{http://www.sqlite.org/}{www.sqlite.org}.
-
-    According to the comments in the source files, the code is in the public
-    domain. See the
-    \l{http://www.sqlite.org/copyright.html}{SQLite Copyright} page on the
-    SQLite web site for further information.
-
-    \section1 TIFF Software Distribution (\c libtiff) version 3.8.2
-
-    \e {libtiff is a set of C functions (a library) that support the
-    manipulation of TIFF image files.} -- quoted from \c
-    src/libtiff/html/libtiff.html
-
-    \hr
-
-    Copyright (c) 1988-1997 Sam Leffler\br
-    Copyright (c) 1991-1997 Silicon Graphics, Inc.\br
-    Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>\br
-    Copyright (c) 1997 Greg Ward Larson
-
-    Permission to use, copy, modify, distribute, and sell this software and
-    its documentation for any purpose is hereby granted without fee, provided
-    that (i) the above copyright notices and this permission notice appear in
-    all copies of the software and related documentation, and (ii) the names of
-    Sam Leffler and Silicon Graphics may not be used in any advertising or
-    publicity relating to the software without the specific, prior written
-    permission of Sam Leffler and Silicon Graphics.
-
-    THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-    WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-    IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-    ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-    OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-    WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-    LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-    OF THIS SOFTWARE.
-
-    \hr
-
-    Copyright (c) 1996-1997 Sam Leffler\br
-    Copyright (c) 1996 Pixar
-
-    Permission to use, copy, modify, distribute, and sell this software and
-    its documentation for any purpose is hereby granted without fee, provided
-    that (i) the above copyright notices and this permission notice appear in
-    all copies of the software and related documentation, and (ii) the names of
-    Pixar, Sam Leffler and Silicon Graphics may not be used in any advertising or
-    publicity relating to the software without the specific, prior written
-    permission of Pixar, Sam Leffler and Silicon Graphics.
-
-    THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-    WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-    IN NO EVENT SHALL PIXAR, SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-    ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-    OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-    WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-    LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-    OF THIS SOFTWARE.
-
-    \hr
-
-    See \c src/3rdparty/libtiff/COPYRIGHT for license details.
-
-    \section1 Wintab API (\c wintab)
-
-    Wintab is a de facto API for pointing devices on Windows. The
-    wintab code is from \l{http://www.pointing.com/WINTAB.HTM}.
-
-    See \c src/3rdparty/wintab/wintab.h for license details.
-
-    \section1 Data Compression Library (\c zlib) version 1.2.3
-
-    \e {zlib is a general purpose data compression library.  All the code
-    is thread safe.  The data format used by the zlib library is described
-    by RFCs (Request for Comments) 1950 to 1952} -- quoted from \c
-    src/3rdparty/zlib/README.
-
-    See \c src/3rdparty/zlib/README for license details.
-*/
diff --git a/doc/src/legal/editions.qdoc b/doc/src/legal/editions.qdoc
deleted file mode 100644
index 4d9d45d46..000000000
--- a/doc/src/legal/editions.qdoc
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \page editions.html
-    \title Qt Editions
-    \ingroup licensing
-    \brief Information about the different editions of Qt.
-
-    Qt can be used to create both commercial and non-commercial
-    software for a wide range of different deployment environments,
-    and is supplied in a number of different forms to suit the needs
-    of different kinds of developers.
-
-    In terms of license conditions, there are two main forms of Qt:
-
-    \list
-    \o The \l{Qt Commercial Edition} are the commercial
-       versions of \l{About Qt}{Qt}.
-    \o The \l{Open Source Versions of Qt} are freely available for download.
-    \endlist
-
-    On the Qt web site, you can find a
-    \l{Qt Licensing Overview} and information on \l{Qt License Pricing}
-    for commercial editions of Qt and other Qt-related products.
-*/
diff --git a/doc/src/legal/gpl.qdoc b/doc/src/legal/gpl.qdoc
deleted file mode 100644
index 9153b2e68..000000000
--- a/doc/src/legal/gpl.qdoc
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*! \page lgpl.html
-\title GNU Lesser General Public License (LGPL)
-\ingroup licensing
-\brief About the LGPL license used for Qt.
-
-The Qt GUI Toolkit is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).\br
-Contact: http://www.qt-project.org/
-
-Qt is available under the LGPL.
-
-\section1 The GNU Lesser General Public License (Version 2.1)
-
-Reference: \l{GNU Lesser General Public License, version 2.1}
-
-\snippet doc/src/snippets/code/doc_src_lgpl.qdoc LGPL v2.1
-
-\section1 Nokia Qt LGPL Exception version 1.0
-
-As a special exception to the GNU Lesser General Public License version 2.1,
-the object code form of a "work that uses the Library" may incorporate material
-from a header file that is part of the Library.  You may distribute such object
-code under terms of your choice, provided that the incorporated material
-(i) does not exceed more than 5% of the total size of the Library;  and
-(ii) is limited to numerical parameters, data structure layouts, accessors,
-macros, inline functions and templates.
-*/
diff --git a/doc/src/legal/opensourceedition.qdoc b/doc/src/legal/opensourceedition.qdoc
deleted file mode 100644
index 60a5f950c..000000000
--- a/doc/src/legal/opensourceedition.qdoc
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*! 
-    \page opensourceedition.html
-
-    \title Open Source Versions of Qt
-    \ingroup licensing
-    \brief Information about the license and features of the Open Source Edition.
-
-    Free (or open source) software is software that comes with a license
-    that gives users certain rights. In particular the right to use the
-    software, to modify it, to obtain its source, and to pass it on (under
-    the same terms). Notice that the term "free" is about rights, not
-    money. The Free Software Foundation (creators of the GNU GPL) speaks
-    of free in this context as in "free speech", not as in "no cost".
-
-    Nokia supports the free software concept by providing the Qt Open Source
-    Edition, which is licensed under the \l{GNU General Public License (GPL)}
-    (version 3) and the \l{GNU Lesser General Public License (LGPL)} (version 2.1).
-    You can use this edition of Qt to create and distribute software with licenses
-    that are compatible to these free software licenses.
-
-    The support of open source with the Open Source Versions of Qt has enabled large
-    successful software projects like KDE to thrive, with thousands of developers
-    around the world using open source versions of Qt at no cost to themselves. With
-    the release of Qt 4, open source versions of Qt became available for Unix/X11,
-    Mac OS X, and Windows platforms.
-
-    The Open Source Edition can be downloaded from the \l{Downloads}{Qt website}.
-
-    Please refer to the online \l{License FAQ} for answers to frequently asked
-    questions on open source licensing and its implications.
-
-    More information on Free and Open Source software is available online:
-
-    \list
-    \o GNU GPL: \l http://www.gnu.org/.
-    \o Open Source licensing: \l http://www.opensource.org/.
-    \endlist
-
-    See \l{Licensing Information} for a collection of documents about licenses
-    used in Qt.
-
-    Information about Qt Commercial License Agreements is available
-    in the \l{Qt Licensing Overview} on the Qt website or by contacting
-    the sales department at http://qt.nokia.com/contact.
-
-    If you are in doubt what edition of Qt is right for your project,
-    please contact
-    \l{mailto:qt-info@nokia.com}{qt-info@nokia.com}.
-
-*/
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
deleted file mode 100644
index 1adbb0a6a..000000000
--- a/doc/src/legal/trademarks.qdoc
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \page trademarks.html
-
-    \title Trademarks
-    \ingroup licensing
-    \brief Information about trademarks owned by Nokia and other organisations.
-
-    Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia \reg
-   Corporation and/or its subsidiaries in Finland and other countries.
-
-    \list
-    \o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of
-       Intel Corporation in the United States, other countries, or both.
-    \o Java and all Java-based trademarks are trademarks of Sun Microsystems,
-       Inc. in the United States, other countries, or both.
-    \o Linux is a \reg trademark of Linus Torvalds in the United States, other
-       countries or both. 
-    \o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc.,
-       registered in the U.S. and other countries. 
-    \o Microsoft, Windows, Windows NT, XP, Visual Studio and the Windows logo
-       are \reg trademarks of Microsoft Corporation in the United States, other
-       countries, or both. 
-    \o Motif is a registered trademark of The Open Group in the United States,
-       other countries, or both. 
-    \o OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States
-       and other countries. 
-    \o UNIX is a registered trademark of The Open Group in the United States
-       and other countries.
-    \o Versit is a \reg trademark of the Internet Mail Consortium in the United States
-       and other countries.
-    \o All other company, product, or service names may be trademarks or
-       service marks of others and are the property of their respective owners.
-       The use of the word partner does not imply a partnership relationship
-       between Nokia and any other company.
-    \endlist
-*/
diff --git a/doc/src/multimedia.qdoc b/doc/src/multimedia.qdoc
index 3bd92eb0a..78426728c 100644
--- a/doc/src/multimedia.qdoc
+++ b/doc/src/multimedia.qdoc
@@ -26,7 +26,6 @@
 ****************************************************************************/
 
 /*!
-
 \page multimediaoverview.html
 \title Qt Multimedia
 \brief A set of APIs for working with audio, video, radio and camera devices.
diff --git a/doc/src/qtmultimedia5.qdoc b/doc/src/qtmultimedia5.qdoc
new file mode 100644
index 000000000..bf659397a
--- /dev/null
+++ b/doc/src/qtmultimedia5.qdoc
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\qmlmodule QtMultimedia 5
+\title QtMultimedia 5.0
+\brief The QML import for QtMultimedia
+
+\section1 Overview
+
+The identifying string for this component is \e QtMultimedia. Use this in the QML \e import statement.
+
+\section1 QML Elements
+
+\annotatedlist multimedia_qml
+
+*/
+