Rename namespace QtMultimedia -> QMultimedia
Main code, examples, tests and docs updated. Method: 1. Mass find+replace "QtMultimedia::" -> "QMultimedia::" 2. Hand-modified declaration in qtmedianamespace.h/cpp For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
committed by
The Qt Project
parent
13fd00199a
commit
832c3929f2
@@ -62,7 +62,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent)
|
||||
ui->imageCodecBox->addItem(codecName+": "+description, QVariant(codecName));
|
||||
}
|
||||
|
||||
ui->imageQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
|
||||
ui->imageQualitySlider->setRange(0, int(QMultimedia::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(QtMultimedia::EncodingQuality(ui->imageQualitySlider->value()));
|
||||
settings.setQuality(QMultimedia::EncodingQuality(ui->imageQualitySlider->value()));
|
||||
settings.setResolution(boxValue(ui->imageResolutionBox).toSize());
|
||||
|
||||
return settings;
|
||||
|
||||
Reference in New Issue
Block a user