Remove the last bits of QtMultimediaKit (*).

Except a comment about it in the module overview.

Change-Id: I22d9111d7917d1a3259ee1e525fd52501733454e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Michael Goddard
2011-10-27 10:45:13 +10:00
committed by Qt by Nokia
parent d3ceea30f8
commit 0ba1c8f4f6
2 changed files with 0 additions and 146 deletions

View File

@@ -1,4 +0,0 @@
# This is only so that Qt5.git still builds, since it's expecting
# the .pro file to match the directory name
include(qtmultimedia.pro)

View File

@@ -53,11 +53,6 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
// For now, for backwards source compatibility
// we have a copy of these enums
// But if you add a new enum value, you won't need
// to copy it to the QtMMK enums since it can't have
// been used before.
namespace QtMultimedia
{
enum MetaData
@@ -194,143 +189,6 @@ namespace QtMultimedia
}
// For legacy support
namespace QtMultimediaKit
{
enum MetaData
{
// Common
Title = QtMultimedia::Title,
SubTitle,
Author,
Comment,
Description,
Category,
Genre,
Year,
Date,
UserRating,
Keywords,
Language,
Publisher,
Copyright,
ParentalRating,
RatingOrganisation,
// Media
Size,
MediaType,
Duration,
// Audio
AudioBitRate,
AudioCodec,
AverageLevel,
ChannelCount,
PeakValue,
SampleRate,
// Music
AlbumTitle,
AlbumArtist,
ContributingArtist,
Composer,
Conductor,
Lyrics,
Mood,
TrackNumber,
TrackCount,
CoverArtUrlSmall,
CoverArtUrlLarge,
// Image/Video
Resolution,
PixelAspectRatio,
// Video
VideoFrameRate,
VideoBitRate,
VideoCodec,
PosterUrl,
// Movie
ChapterNumber,
Director,
LeadPerformer,
Writer,
// Photos
CameraManufacturer,
CameraModel,
Event,
Subject,
Orientation,
ExposureTime,
FNumber,
ExposureProgram,
ISOSpeedRatings,
ExposureBiasValue,
DateTimeOriginal,
DateTimeDigitized,
SubjectDistance,
MeteringMode,
LightSource,
Flash,
FocalLength,
ExposureMode,
WhiteBalance,
DigitalZoomRatio,
FocalLengthIn35mmFilm,
SceneCaptureType,
GainControl,
Contrast,
Saturation,
Sharpness,
DeviceSettingDescription,
PosterImage,
CoverArtImage,
ThumbnailImage
};
enum SupportEstimate
{
NotSupported = QtMultimedia::NotSupported,
MaybeSupported,
ProbablySupported,
PreferredService
};
enum EncodingQuality
{
VeryLowQuality = QtMultimedia::VeryLowQuality,
LowQuality,
NormalQuality,
HighQuality,
VeryHighQuality
};
enum EncodingMode
{
ConstantQualityEncoding = QtMultimedia::ConstantQualityEncoding,
ConstantBitRateEncoding,
AverageBitRateEncoding,
TwoPassEncoding
};
enum AvailabilityError
{
NoError = QtMultimedia::NoError,
ServiceMissingError,
BusyError,
ResourceError
};
}
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QtMultimedia::AvailabilityError)