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
@@ -65,12 +65,12 @@ public:
|
||||
settings.resolution() == QSize(320,240))
|
||||
resolutions << settings.resolution();
|
||||
|
||||
if (settings.quality() == QtMultimedia::HighQuality && settings.resolution() == QSize(640,480))
|
||||
if (settings.quality() == QMultimedia::HighQuality && settings.resolution() == QSize(640,480))
|
||||
resolutions << settings.resolution();
|
||||
} else {
|
||||
resolutions << QSize(160, 120);
|
||||
resolutions << QSize(320, 240);
|
||||
if (settings.quality() == QtMultimedia::HighQuality)
|
||||
if (settings.quality() == QMultimedia::HighQuality)
|
||||
resolutions << QSize(640, 480);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user