Rename QtMultimediaKit to QtMultimedia.

There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-10-06 14:31:58 +10:00
committed by Qt by Nokia
parent 55bc4f2b46
commit 03f22bcdaf
395 changed files with 1393 additions and 3088 deletions

View File

@@ -0,0 +1,113 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part 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$
**
****************************************************************************/
#include <QDebug>
#include <private/qmediaobject_p.h>
#include <qcamera.h>
#include <qcameraviewfinder.h>
#include <qvideowidget_p.h>
#include <qvideodevicecontrol.h>
QT_USE_NAMESPACE
/*!
\class QCameraViewfinder
\brief The QCameraViewfinder class provides a camera viewfinder widget.
\inmodule QtMultimedia
\ingroup camera
\since 1.1
\snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera
*/
class QCameraViewfinderPrivate : public QVideoWidgetPrivate
{
Q_DECLARE_NON_CONST_PUBLIC(QCameraViewfinder)
public:
QCameraViewfinderPrivate():
QVideoWidgetPrivate()
{
}
};
/*!
Constructs a new camera viewfinder widget.
The \a parent is passed to QVideoWidget.
*/
QCameraViewfinder::QCameraViewfinder(QWidget *parent)
:QVideoWidget(*new QCameraViewfinderPrivate, parent)
{
}
/*!
Destroys a camera viewfinder widget.
*/
QCameraViewfinder::~QCameraViewfinder()
{
}
/*!
\reimp
\since 1.1
*/
QMediaObject *QCameraViewfinder::mediaObject() const
{
return QVideoWidget::mediaObject();
}
/*!
\reimp
\since 1.1
*/
bool QCameraViewfinder::setMediaObject(QMediaObject *object)
{
return QVideoWidget::setMediaObject(object);
}
#include "moc_qcameraviewfinder.cpp"