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>

4 files changed, 10 insertions, 10 deletions

diff --git a/examples/camera/camera.cpp b/examples/camera/camera.cpp
index b8bb675be..d30d6c19d 100644
--- a/examples/camera/camera.cpp
+++ b/examples/camera/camera.cpp
@@ -124,7 +124,7 @@ void Camera::setCamera(const QByteArray &cameraDevice)
     connect(mediaRecorder, SIGNAL(durationChanged(qint64)), this, SLOT(updateRecordTime()));
     connect(mediaRecorder, SIGNAL(error(QMediaRecorder::Error)), this, SLOT(displayRecorderError()));
 
-    mediaRecorder->setMetaData(QtMultimediaKit::Title, QVariant(QLatin1String("Test Title")));
+    mediaRecorder->setMetaData(QtMultimedia::Title, QVariant(QLatin1String("Test Title")));
 
     connect(ui->exposureCompensation, SIGNAL(valueChanged(int)), SLOT(setExposureCompensation(int)));
 
diff --git a/examples/camera/camera.pro b/examples/camera/camera.pro
index a519354ed..f7dd8b787 100644
--- a/examples/camera/camera.pro
+++ b/examples/camera/camera.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = camera
 
-QT += multimediakit multimediakitwidgets
+QT += multimedia multimediawidgets
 
 HEADERS = \
     camera.h \
@@ -19,9 +19,9 @@ FORMS += \
     videosettings.ui \
     imagesettings.ui
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera
+target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera
 
 INSTALLS += target sources
 
diff --git a/examples/camera/imagesettings.cpp b/examples/camera/imagesettings.cpp
index c3b9b22c2..bb73f3a02 100644
--- a/examples/camera/imagesettings.cpp
+++ b/examples/camera/imagesettings.cpp
@@ -62,7 +62,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent)
         ui->imageCodecBox->addItem(codecName+": "+description, QVariant(codecName));
     }
 
-    ui->imageQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
+    ui->imageQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
 
     ui->imageResolutionBox->addItem(tr("Default Resolution"));
     QList<QSize> supportedResolutions = imagecapture->supportedResolutions();
@@ -93,7 +93,7 @@ QImageEncoderSettings ImageSettings::imageSettings() const
 {
     QImageEncoderSettings settings = imagecapture->encodingSettings();
     settings.setCodec(boxValue(ui->imageCodecBox).toString());
-    settings.setQuality(QtMultimediaKit::EncodingQuality(ui->imageQualitySlider->value()));
+    settings.setQuality(QtMultimedia::EncodingQuality(ui->imageQualitySlider->value()));
     settings.setResolution(boxValue(ui->imageResolutionBox).toSize());
 
     return settings;
diff --git a/examples/camera/videosettings.cpp b/examples/camera/videosettings.cpp
index c1d816012..f97f4adf2 100644
--- a/examples/camera/videosettings.cpp
+++ b/examples/camera/videosettings.cpp
@@ -66,7 +66,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) :
         ui->audioSampleRateBox->addItem(QString::number(sampleRate), QVariant(sampleRate));
     }
 
-    ui->audioQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
+    ui->audioQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
 
     //video codecs
     ui->videoCodecBox->addItem(tr("Default video codec"), QVariant(QString()));
@@ -75,7 +75,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) :
         ui->videoCodecBox->addItem(codecName+": "+description, QVariant(codecName));
     }
 
-    ui->videoQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
+    ui->videoQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
 
 
     ui->videoResolutionBox->addItem(tr("Default"));
@@ -122,7 +122,7 @@ QAudioEncoderSettings VideoSettings::audioSettings() const
 {
     QAudioEncoderSettings settings = mediaRecorder->audioSettings();
     settings.setCodec(boxValue(ui->audioCodecBox).toString());
-    settings.setQuality(QtMultimediaKit::EncodingQuality(ui->audioQualitySlider->value()));
+    settings.setQuality(QtMultimedia::EncodingQuality(ui->audioQualitySlider->value()));
     settings.setSampleRate(boxValue(ui->audioSampleRateBox).toInt());
     return settings;
 }
@@ -138,7 +138,7 @@ QVideoEncoderSettings VideoSettings::videoSettings() const
 {
     QVideoEncoderSettings settings = mediaRecorder->videoSettings();
     settings.setCodec(boxValue(ui->videoCodecBox).toString());
-    settings.setQuality(QtMultimediaKit::EncodingQuality(ui->videoQualitySlider->value()));
+    settings.setQuality(QtMultimedia::EncodingQuality(ui->videoQualitySlider->value()));
     settings.setResolution(boxValue(ui->videoResolutionBox).toSize());
     settings.setFrameRate(boxValue(ui->videoFramerateBox).value<qreal>());