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>

src/imports/multimedia/multimedia.cpp

@@ -68,7 +68,8 @@ class QMultimediaDeclarativeModule : public QDeclarativeExtensionPlugin
 public:
     virtual void registerTypes(const char *uri)
     {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimediakit"));
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimedia")
+                || QLatin1String(uri) == QLatin1String("Qt.multimediakit"));
 
         qmlRegisterType<QSoundEffect>(uri, 4, 0, "SoundEffect");
         qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "Audio");

src/imports/multimedia/multimedia.pro

@@ -1,11 +1,11 @@
 TARGET = declarative_multimedia
-TARGETPATH = Qt/multimediakit
+TARGETPATH = QtMultimedia
 
 include(../qimportbase.pri)
 
-QT += declarative network multimediakit-private
+QT += declarative network multimedia-private
 
-DESTDIR = $$QT.multimediakit.imports/$$TARGETPATH
+DESTDIR = $$QT.multimedia.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 HEADERS += \
@@ -59,4 +59,16 @@ disabled {
 qmldir.files += $$PWD/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
+# another copy of the qmldir file so the old import works
+OLDQMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir.qtmultimediakit
+oldcopy2build.input = OLDQMLDIRFILE
+oldcopy2build.output = $$QT.multimedia.imports/Qt/multimediakit/qmldir
+!contains(TEMPLATE_PREFIX, vc):oldcopy2build.variable_out = PRE_TARGETDEPS
+oldcopy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+oldcopy2build.name = COPY ${QMAKE_FILE_IN}
+oldcopy2build.CONFIG += no_link
+# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
+oldcopy2build.CONFIG += no_clean
+QMAKE_EXTRA_COMPILERS += oldcopy2build
+
 INSTALLS += target qmldir

src/imports/multimedia/qdeclarativeaudio.cpp

@@ -52,11 +52,11 @@ QT_BEGIN_NAMESPACE
 
     \ingroup qml-multimedia
 
-    This element is part of the \bold{QtMultimediaKit 1.1} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     \qml
     import Qt 4.7
-    import QtMultimediaKit 1.1
+    import QtMultimedia 4.0
 
     Text {
         text: "Click Me!";
@@ -333,7 +333,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the tile of the media.
 
-    \sa {QtMultimediaKit::Title}
+    \sa {QtMultimedia::Title}
 */
 
 /*!
@@ -341,7 +341,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the sub-title of the media.
 
-    \sa {QtMultimediaKit::SubTitle}
+    \sa {QtMultimedia::SubTitle}
 */
 
 /*!
@@ -349,7 +349,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the author of the media.
 
-    \sa {QtMultimediaKit::Author}
+    \sa {QtMultimedia::Author}
 */
 
 /*!
@@ -357,7 +357,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds a user comment about the media.
 
-    \sa {QtMultimediaKit::Comment}
+    \sa {QtMultimedia::Comment}
 */
 
 /*!
@@ -365,7 +365,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds a description of the media.
 
-    \sa {QtMultimediaKit::Description}
+    \sa {QtMultimedia::Description}
 */
 
 /*!
@@ -373,7 +373,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the category of the media
 
-    \sa {QtMultimediaKit::Category}
+    \sa {QtMultimedia::Category}
 */
 
 /*!
@@ -381,7 +381,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the genre of the media.
 
-    \sa {QtMultimediaKit::Genre}
+    \sa {QtMultimedia::Genre}
 */
 
 /*!
@@ -389,7 +389,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the year of release of the media.
 
-    \sa {QtMultimediaKit::Year}
+    \sa {QtMultimedia::Year}
 */
 
 /*!
@@ -397,7 +397,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the date of the media.
 
-    \sa {QtMultimediaKit::Date}
+    \sa {QtMultimedia::Date}
 */
 
 /*!
@@ -405,7 +405,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds a user rating of the media in the range of 0 to 100.
 
-    \sa {QtMultimediaKit::UserRating}
+    \sa {QtMultimedia::UserRating}
 */
 
 /*!
@@ -413,7 +413,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds a list of keywords describing the media.
 
-    \sa {QtMultimediaKit::Keywords}
+    \sa {QtMultimedia::Keywords}
 */
 
 /*!
@@ -421,7 +421,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the language of the media, as an ISO 639-2 code.
 
-    \sa {QtMultimediaKit::Language}
+    \sa {QtMultimedia::Language}
 */
 
 /*!
@@ -429,7 +429,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the publisher of the media.
 
-    \sa {QtMultimediaKit::Publisher}
+    \sa {QtMultimedia::Publisher}
 */
 
 /*!
@@ -437,7 +437,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the media's copyright notice.
 
-    \sa {QtMultimediaKit::Copyright}
+    \sa {QtMultimedia::Copyright}
 */
 
 /*!
@@ -445,7 +445,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the parental rating of the media.
 
-    \sa {QtMultimediaKit::ParentalRating}
+    \sa {QtMultimedia::ParentalRating}
 */
 
 /*!
@@ -454,7 +454,7 @@ void QDeclarativeAudio::componentComplete()
     This property holds the name of the rating organisation responsible for the
     parental rating of the media.
 
-    \sa {QtMultimediaKit::RatingOrganisation}
+    \sa {QtMultimedia::RatingOrganisation}
 */
 
 /*!
@@ -462,7 +462,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property property holds the size of the media in bytes.
 
-    \sa {QtMultimediaKit::Size}
+    \sa {QtMultimedia::Size}
 */
 
 /*!
@@ -470,7 +470,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the type of the media.
 
-    \sa {QtMultimediaKit::MediaType}
+    \sa {QtMultimedia::MediaType}
 */
 
 /*!
@@ -479,7 +479,7 @@ void QDeclarativeAudio::componentComplete()
     This property holds the bit rate of the media's audio stream ni bits per
     second.
 
-    \sa {QtMultimediaKit::AudioBitRate}
+    \sa {QtMultimedia::AudioBitRate}
 */
 
 /*!
@@ -487,7 +487,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the encoding of the media audio stream.
 
-    \sa {QtMultimediaKit::AudioCodec}
+    \sa {QtMultimedia::AudioCodec}
 */
 
 /*!
@@ -495,7 +495,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the average volume level of the media.
 
-    \sa {QtMultimediaKit::AverageLevel}
+    \sa {QtMultimedia::AverageLevel}
 */
 
 /*!
@@ -503,7 +503,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the number of channels in the media's audio stream.
 
-    \sa {QtMultimediaKit::ChannelCount}
+    \sa {QtMultimedia::ChannelCount}
 */
 
 /*!
@@ -511,7 +511,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the peak volume of media's audio stream.
 
-    \sa {QtMultimediaKit::PeakValue}
+    \sa {QtMultimedia::PeakValue}
 */
 
 /*!
@@ -519,7 +519,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the sample rate of the media's audio stream in hertz.
 
-    \sa {QtMultimediaKit::SampleRate}
+    \sa {QtMultimedia::SampleRate}
 */
 
 /*!
@@ -527,7 +527,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the title of the album the media belongs to.
 
-    \sa {QtMultimediaKit::AlbumTitle}
+    \sa {QtMultimedia::AlbumTitle}
 */
 
 /*!
@@ -536,7 +536,7 @@ void QDeclarativeAudio::componentComplete()
     This property holds the name of the principal artist of the album the media
     belongs to.
 
-    \sa {QtMultimediaKit::AlbumArtist}
+    \sa {QtMultimedia::AlbumArtist}
 */
 
 /*!
@@ -544,7 +544,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the names of artists contributing to the media.
 
-    \sa {QtMultimediaKit::ContributingArtist}
+    \sa {QtMultimedia::ContributingArtist}
 */
 
 /*!
@@ -552,7 +552,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the composer of the media.
 
-    \sa {QtMultimediaKit::Composer}
+    \sa {QtMultimedia::Composer}
 */
 
 /*!
@@ -560,7 +560,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the conductor of the media.
 
-    \sa {QtMultimediaKit::Conductor}
+    \sa {QtMultimedia::Conductor}
 */
 
 /*!
@@ -568,7 +568,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the lyrics to the media.
 
-    \sa {QtMultimediaKit::Lyrics}
+    \sa {QtMultimedia::Lyrics}
 */
 
 /*!
@@ -576,7 +576,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the mood of the media.
 
-    \sa {QtMultimediaKit::Mood}
+    \sa {QtMultimedia::Mood}
 */
 
 /*!
@@ -584,7 +584,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the track number of the media.
 
-    \sa {QtMultimediaKit::TrackNumber}
+    \sa {QtMultimedia::TrackNumber}
 */
 
 /*!
@@ -592,7 +592,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the number of track on the album containing the media.
 
-    \sa {QtMultimediaKit::TrackNumber}
+    \sa {QtMultimedia::TrackNumber}
 */
 
 /*!
@@ -600,7 +600,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the URL of a small cover art image.
 
-    \sa {QtMultimediaKit::CoverArtUrlSmall}
+    \sa {QtMultimedia::CoverArtUrlSmall}
 */
 
 /*!
@@ -608,7 +608,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the URL of a large cover art image.
 
-    \sa {QtMultimediaKit::CoverArtUrlLarge}
+    \sa {QtMultimedia::CoverArtUrlLarge}
 */
 
 /*!
@@ -616,7 +616,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the dimension of an image or video.
 
-    \sa {QtMultimediaKit::Resolution}
+    \sa {QtMultimedia::Resolution}
 */
 
 /*!
@@ -624,7 +624,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the pixel aspect ratio of an image or video.
 
-    \sa {QtMultimediaKit::PixelAspectRatio}
+    \sa {QtMultimedia::PixelAspectRatio}
 */
 
 /*!
@@ -632,7 +632,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the frame rate of the media's video stream.
 
-    \sa {QtMultimediaKit::VideoFrameRate}
+    \sa {QtMultimedia::VideoFrameRate}
 */
 
 /*!
@@ -641,7 +641,7 @@ void QDeclarativeAudio::componentComplete()
     This property holds the bit rate of the media's video stream in bits per
     second.
 
-    \sa {QtMultimediaKit::VideoBitRate}
+    \sa {QtMultimedia::VideoBitRate}
 */
 
 /*!
@@ -649,7 +649,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the encoding of the media's video stream.
 
-    \sa {QtMultimediaKit::VideoCodec}
+    \sa {QtMultimedia::VideoCodec}
 */
 
 /*!
@@ -657,7 +657,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the URL of a poster image.
 
-    \sa {QtMultimediaKit::PosterUrl}
+    \sa {QtMultimedia::PosterUrl}
 */
 
 /*!
@@ -665,7 +665,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the chapter number of the media.
 
-    \sa {QtMultimediaKit::ChapterNumber}
+    \sa {QtMultimedia::ChapterNumber}
 */
 
 /*!
@@ -673,7 +673,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the director of the media.
 
-    \sa {QtMultimediaKit::Director}
+    \sa {QtMultimedia::Director}
 */
 
 /*!
@@ -681,7 +681,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the lead performer in the media.
 
-    \sa {QtMultimediaKit::LeadPerformer}
+    \sa {QtMultimedia::LeadPerformer}
 */
 
 /*!
@@ -689,7 +689,7 @@ void QDeclarativeAudio::componentComplete()
 
     This property holds the writer of the media.
 
-    \sa {QtMultimediaKit::Writer}
+    \sa {QtMultimedia::Writer}
 */
 
 QT_END_NAMESPACE

src/imports/multimedia/qdeclarativecamera.cpp

@@ -75,11 +75,11 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
     \ingroup qml-multimedia
     \inherits Item
 
-    This element is part of the \bold{QtMultimediaKit 1.1} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     \qml
     import Qt 4.7
-    import QtMultimediaKit 1.1
+    import QtMultimedia 4.0
 
     Camera {
         id: camera

src/imports/multimedia/qdeclarativecameraexposure.cpp

@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
     \brief The CameraExposure element provides interface for exposure related camera settings.
     \ingroup qml-multimedia
 
-    This element is part of the \bold{Qt.multimediakit 4.0} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     It should not be constructed separately but provided by Camera.exposure.
 
     \qml
     import QtQuick 2.0
-    import Qt.multimediakit 4.0
+    import QtMultimedia 4.0
 
     Camera {
         id: camera

src/imports/multimedia/qdeclarativecameraflash.cpp

@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
     \brief The CameraFlash element provides interface for flash related camera settings.
     \ingroup qml-multimedia
 
-    This element is part of the \bold{Qt.multimediakit 4.0} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     It should not be constructed separately but provided by Camera.flash.
 
     \qml
     import QtQuick 2.0
-    import Qt.multimediakit 4.0
+    import QtMultimedia 4.0
 
     Camera {
         id: camera

src/imports/multimedia/qdeclarativecamerafocus.cpp

@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
     \brief The CameraFocus element provides interface for focus related camera settings.
     \ingroup qml-multimedia
 
-    This element is part of the \bold{Qt.multimediakit 4.0} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     It should not be constructed separately but provided by Camera.focus.
 
     \qml
     import QtQuick 2.0
-    import Qt.multimediakit 4.0
+    import QtMultimedia 4.0
 
     Camera {
         id: camera

src/imports/multimedia/qdeclarativemediabase.cpp

@@ -109,9 +109,9 @@ public:
 
     bool isMetaDataAvailable() const { return false; }
 
-    QVariant metaData(QtMultimediaKit::MetaData) const { return QVariant(); }
-    QList<QtMultimediaKit::MetaData> availableMetaData() const {
-        return QList<QtMultimediaKit::MetaData>(); }
+    QVariant metaData(QtMultimedia::MetaData) const { return QVariant(); }
+    QList<QtMultimedia::MetaData> availableMetaData() const {
+        return QList<QtMultimedia::MetaData>(); }
 
     QVariant extendedMetaData(const QString &) const { return QVariant(); }
     QStringList availableExtendedMetaData() const { return QStringList(); }

src/imports/multimedia/qdeclarativemediametadata_p.h

@@ -117,57 +117,57 @@ public:
     {
     }
 
-    QVariant title() const { return m_control->metaData(QtMultimediaKit::Title); }
-    QVariant subTitle() const { return m_control->metaData(QtMultimediaKit::SubTitle); }
-    QVariant author() const { return m_control->metaData(QtMultimediaKit::Author); }
-    QVariant comment() const { return m_control->metaData(QtMultimediaKit::Comment); }
-    QVariant description() const { return m_control->metaData(QtMultimediaKit::Description); }
-    QVariant category() const { return m_control->metaData(QtMultimediaKit::Category); }
-    QVariant genre() const { return m_control->metaData(QtMultimediaKit::Genre); }
-    QVariant year() const { return m_control->metaData(QtMultimediaKit::Year); }
-    QVariant date() const { return m_control->metaData(QtMultimediaKit::Date); }
-    QVariant userRating() const { return m_control->metaData(QtMultimediaKit::UserRating); }
-    QVariant keywords() const { return m_control->metaData(QtMultimediaKit::Keywords); }
-    QVariant language() const { return m_control->metaData(QtMultimediaKit::Language); }
-    QVariant publisher() const { return m_control->metaData(QtMultimediaKit::Publisher); }
-    QVariant copyright() const { return m_control->metaData(QtMultimediaKit::Copyright); }
-    QVariant parentalRating() const { return m_control->metaData(QtMultimediaKit::ParentalRating); }
+    QVariant title() const { return m_control->metaData(QtMultimedia::Title); }
+    QVariant subTitle() const { return m_control->metaData(QtMultimedia::SubTitle); }
+    QVariant author() const { return m_control->metaData(QtMultimedia::Author); }
+    QVariant comment() const { return m_control->metaData(QtMultimedia::Comment); }
+    QVariant description() const { return m_control->metaData(QtMultimedia::Description); }
+    QVariant category() const { return m_control->metaData(QtMultimedia::Category); }
+    QVariant genre() const { return m_control->metaData(QtMultimedia::Genre); }
+    QVariant year() const { return m_control->metaData(QtMultimedia::Year); }
+    QVariant date() const { return m_control->metaData(QtMultimedia::Date); }
+    QVariant userRating() const { return m_control->metaData(QtMultimedia::UserRating); }
+    QVariant keywords() const { return m_control->metaData(QtMultimedia::Keywords); }
+    QVariant language() const { return m_control->metaData(QtMultimedia::Language); }
+    QVariant publisher() const { return m_control->metaData(QtMultimedia::Publisher); }
+    QVariant copyright() const { return m_control->metaData(QtMultimedia::Copyright); }
+    QVariant parentalRating() const { return m_control->metaData(QtMultimedia::ParentalRating); }
     QVariant ratingOrganisation() const {
-        return m_control->metaData(QtMultimediaKit::RatingOrganisation); }
-    QVariant size() const { return m_control->metaData(QtMultimediaKit::Size); }
-    QVariant mediaType() const { return m_control->metaData(QtMultimediaKit::MediaType); }
-    QVariant duration() const { return m_control->metaData(QtMultimediaKit::Duration); }
-    QVariant audioBitRate() const { return m_control->metaData(QtMultimediaKit::AudioBitRate); }
-    QVariant audioCodec() const { return m_control->metaData(QtMultimediaKit::AudioCodec); }
-    QVariant averageLevel() const { return m_control->metaData(QtMultimediaKit::AverageLevel); }
-    QVariant channelCount() const { return m_control->metaData(QtMultimediaKit::ChannelCount); }
-    QVariant peakValue() const { return m_control->metaData(QtMultimediaKit::PeakValue); }
-    QVariant sampleRate() const { return m_control->metaData(QtMultimediaKit::SampleRate); }
-    QVariant albumTitle() const { return m_control->metaData(QtMultimediaKit::AlbumTitle); }
-    QVariant albumArtist() const { return m_control->metaData(QtMultimediaKit::AlbumArtist); }
+        return m_control->metaData(QtMultimedia::RatingOrganisation); }
+    QVariant size() const { return m_control->metaData(QtMultimedia::Size); }
+    QVariant mediaType() const { return m_control->metaData(QtMultimedia::MediaType); }
+    QVariant duration() const { return m_control->metaData(QtMultimedia::Duration); }
+    QVariant audioBitRate() const { return m_control->metaData(QtMultimedia::AudioBitRate); }
+    QVariant audioCodec() const { return m_control->metaData(QtMultimedia::AudioCodec); }
+    QVariant averageLevel() const { return m_control->metaData(QtMultimedia::AverageLevel); }
+    QVariant channelCount() const { return m_control->metaData(QtMultimedia::ChannelCount); }
+    QVariant peakValue() const { return m_control->metaData(QtMultimedia::PeakValue); }
+    QVariant sampleRate() const { return m_control->metaData(QtMultimedia::SampleRate); }
+    QVariant albumTitle() const { return m_control->metaData(QtMultimedia::AlbumTitle); }
+    QVariant albumArtist() const { return m_control->metaData(QtMultimedia::AlbumArtist); }
     QVariant contributingArtist() const {
-        return m_control->metaData(QtMultimediaKit::ContributingArtist); }
-    QVariant composer() const { return m_control->metaData(QtMultimediaKit::Composer); }
-    QVariant conductor() const { return m_control->metaData(QtMultimediaKit::Conductor); }
-    QVariant lyrics() const { return m_control->metaData(QtMultimediaKit::Lyrics); }
-    QVariant mood() const { return m_control->metaData(QtMultimediaKit::Mood); }
-    QVariant trackNumber() const { return m_control->metaData(QtMultimediaKit::TrackNumber); }
-    QVariant trackCount() const { return m_control->metaData(QtMultimediaKit::TrackCount); }
+        return m_control->metaData(QtMultimedia::ContributingArtist); }
+    QVariant composer() const { return m_control->metaData(QtMultimedia::Composer); }
+    QVariant conductor() const { return m_control->metaData(QtMultimedia::Conductor); }
+    QVariant lyrics() const { return m_control->metaData(QtMultimedia::Lyrics); }
+    QVariant mood() const { return m_control->metaData(QtMultimedia::Mood); }
+    QVariant trackNumber() const { return m_control->metaData(QtMultimedia::TrackNumber); }
+    QVariant trackCount() const { return m_control->metaData(QtMultimedia::TrackCount); }
     QVariant coverArtUrlSmall() const {
-        return m_control->metaData(QtMultimediaKit::CoverArtUrlSmall); }
+        return m_control->metaData(QtMultimedia::CoverArtUrlSmall); }
     QVariant coverArtUrlLarge() const {
-        return m_control->metaData(QtMultimediaKit::CoverArtUrlLarge); }
-    QVariant resolution() const { return m_control->metaData(QtMultimediaKit::Resolution); }
+        return m_control->metaData(QtMultimedia::CoverArtUrlLarge); }
+    QVariant resolution() const { return m_control->metaData(QtMultimedia::Resolution); }
     QVariant pixelAspectRatio() const {
-        return m_control->metaData(QtMultimediaKit::PixelAspectRatio); }
-    QVariant videoFrameRate() const { return m_control->metaData(QtMultimediaKit::VideoFrameRate); }
-    QVariant videoBitRate() const { return m_control->metaData(QtMultimediaKit::VideoBitRate); }
-    QVariant videoCodec() const { return m_control->metaData(QtMultimediaKit::VideoCodec); }
-    QVariant posterUrl() const { return m_control->metaData(QtMultimediaKit::PosterUrl); }
-    QVariant chapterNumber() const { return m_control->metaData(QtMultimediaKit::ChapterNumber); }
-    QVariant director() const { return m_control->metaData(QtMultimediaKit::Director); }
-    QVariant leadPerformer() const { return m_control->metaData(QtMultimediaKit::LeadPerformer); }
-    QVariant writer() const { return m_control->metaData(QtMultimediaKit::Writer); }
+        return m_control->metaData(QtMultimedia::PixelAspectRatio); }
+    QVariant videoFrameRate() const { return m_control->metaData(QtMultimedia::VideoFrameRate); }
+    QVariant videoBitRate() const { return m_control->metaData(QtMultimedia::VideoBitRate); }
+    QVariant videoCodec() const { return m_control->metaData(QtMultimedia::VideoCodec); }
+    QVariant posterUrl() const { return m_control->metaData(QtMultimedia::PosterUrl); }
+    QVariant chapterNumber() const { return m_control->metaData(QtMultimedia::ChapterNumber); }
+    QVariant director() const { return m_control->metaData(QtMultimedia::Director); }
+    QVariant leadPerformer() const { return m_control->metaData(QtMultimedia::LeadPerformer); }
+    QVariant writer() const { return m_control->metaData(QtMultimedia::Writer); }
 
 Q_SIGNALS:
     void metaDataChanged();

src/imports/multimedia/qdeclarativevideo.cpp

@@ -72,11 +72,11 @@ void QDeclarativeVideo::_q_error(int errorCode, const QString &errorString)
     \inherits Item
     \ingroup qml-multimedia
 
-    This element is part of the \bold{QtMultimediaKit 1.1} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     \qml
     import Qt 4.7
-    import QtMultimediaKit 1.1
+    import QtMultimedia 4.0
 
     Video {
         id: video
@@ -427,7 +427,7 @@ QT_END_NAMESPACE
 
     This property holds the tile of the media.
 
-    \sa {QtMultimediaKit::Title}
+    \sa {QtMultimedia::Title}
 */
 
 /*!
@@ -435,7 +435,7 @@ QT_END_NAMESPACE
 
     This property holds the sub-title of the media.
 
-    \sa {QtMultimediaKit::SubTitle}
+    \sa {QtMultimedia::SubTitle}
 */
 
 /*!
@@ -443,7 +443,7 @@ QT_END_NAMESPACE
 
     This property holds the author of the media.
 
-    \sa {QtMultimediaKit::Author}
+    \sa {QtMultimedia::Author}
 */
 
 /*!
@@ -451,7 +451,7 @@ QT_END_NAMESPACE
 
     This property holds a user comment about the media.
 
-    \sa {QtMultimediaKit::Comment}
+    \sa {QtMultimedia::Comment}
 */
 
 /*!
@@ -459,7 +459,7 @@ QT_END_NAMESPACE
 
     This property holds a description of the media.
 
-    \sa {QtMultimediaKit::Description}
+    \sa {QtMultimedia::Description}
 */
 
 /*!
@@ -467,7 +467,7 @@ QT_END_NAMESPACE
 
     This property holds the category of the media
 
-    \sa {QtMultimediaKit::Category}
+    \sa {QtMultimedia::Category}
 */
 
 /*!
@@ -475,7 +475,7 @@ QT_END_NAMESPACE
 
     This property holds the genre of the media.
 
-    \sa {QtMultimediaKit::Genre}
+    \sa {QtMultimedia::Genre}
 */
 
 /*!
@@ -483,7 +483,7 @@ QT_END_NAMESPACE
 
     This property holds the year of release of the media.
 
-    \sa {QtMultimediaKit::Year}
+    \sa {QtMultimedia::Year}
 */
 
 /*!
@@ -491,7 +491,7 @@ QT_END_NAMESPACE
 
     This property holds the date of the media.
 
-    \sa {QtMultimediaKit::Date}
+    \sa {QtMultimedia::Date}
 */
 
 /*!
@@ -499,7 +499,7 @@ QT_END_NAMESPACE
 
     This property holds a user rating of the media in the range of 0 to 100.
 
-    \sa {QtMultimediaKit::UserRating}
+    \sa {QtMultimedia::UserRating}
 */
 
 /*!
@@ -507,7 +507,7 @@ QT_END_NAMESPACE
 
     This property holds a list of keywords describing the media.
 
-    \sa {QtMultimediaKit::Keywords}
+    \sa {QtMultimedia::Keywords}
 */
 
 /*!
@@ -515,7 +515,7 @@ QT_END_NAMESPACE
 
     This property holds the language of the media, as an ISO 639-2 code.
 
-    \sa {QtMultimediaKit::Language}
+    \sa {QtMultimedia::Language}
 */
 
 /*!
@@ -523,7 +523,7 @@ QT_END_NAMESPACE
 
     This property holds the publisher of the media.
 
-    \sa {QtMultimediaKit::Publisher}
+    \sa {QtMultimedia::Publisher}
 */
 
 /*!
@@ -531,7 +531,7 @@ QT_END_NAMESPACE
 
     This property holds the media's copyright notice.
 
-    \sa {QtMultimediaKit::Copyright}
+    \sa {QtMultimedia::Copyright}
 */
 
 /*!
@@ -539,7 +539,7 @@ QT_END_NAMESPACE
 
     This property holds the parental rating of the media.
 
-    \sa {QtMultimediaKit::ParentalRating}
+    \sa {QtMultimedia::ParentalRating}
 */
 
 /*!
@@ -548,7 +548,7 @@ QT_END_NAMESPACE
     This property holds the name of the rating organisation responsible for the
     parental rating of the media.
 
-    \sa {QtMultimediaKit::RatingOrganisation}
+    \sa {QtMultimedia::RatingOrganisation}
 */
 
 /*!
@@ -556,7 +556,7 @@ QT_END_NAMESPACE
 
     This property property holds the size of the media in bytes.
 
-    \sa {QtMultimediaKit::Size}
+    \sa {QtMultimedia::Size}
 */
 
 /*!
@@ -564,7 +564,7 @@ QT_END_NAMESPACE
 
     This property holds the type of the media.
 
-    \sa {QtMultimediaKit::MediaType}
+    \sa {QtMultimedia::MediaType}
 */
 
 /*!
@@ -573,7 +573,7 @@ QT_END_NAMESPACE
     This property holds the bit rate of the media's audio stream ni bits per
     second.
 
-    \sa {QtMultimediaKit::AudioBitRate}
+    \sa {QtMultimedia::AudioBitRate}
 */
 
 /*!
@@ -581,7 +581,7 @@ QT_END_NAMESPACE
 
     This property holds the encoding of the media audio stream.
 
-    \sa {QtMultimediaKit::AudioCodec}
+    \sa {QtMultimedia::AudioCodec}
 */
 
 /*!
@@ -589,7 +589,7 @@ QT_END_NAMESPACE
 
     This property holds the average volume level of the media.
 
-    \sa {QtMultimediaKit::AverageLevel}
+    \sa {QtMultimedia::AverageLevel}
 */
 
 /*!
@@ -597,7 +597,7 @@ QT_END_NAMESPACE
 
     This property holds the number of channels in the media's audio stream.
 
-    \sa {QtMultimediaKit::ChannelCount}
+    \sa {QtMultimedia::ChannelCount}
 */
 
 /*!
@@ -605,7 +605,7 @@ QT_END_NAMESPACE
 
     This property holds the peak volume of media's audio stream.
 
-    \sa {QtMultimediaKit::PeakValue}
+    \sa {QtMultimedia::PeakValue}
 */
 
 /*!
@@ -613,7 +613,7 @@ QT_END_NAMESPACE
 
     This property holds the sample rate of the media's audio stream in hertz.
 
-    \sa {QtMultimediaKit::SampleRate}
+    \sa {QtMultimedia::SampleRate}
 */
 
 /*!
@@ -621,7 +621,7 @@ QT_END_NAMESPACE
 
     This property holds the title of the album the media belongs to.
 
-    \sa {QtMultimediaKit::AlbumTitle}
+    \sa {QtMultimedia::AlbumTitle}
 */
 
 /*!
@@ -630,7 +630,7 @@ QT_END_NAMESPACE
     This property holds the name of the principal artist of the album the media
     belongs to.
 
-    \sa {QtMultimediaKit::AlbumArtist}
+    \sa {QtMultimedia::AlbumArtist}
 */
 
 /*!
@@ -638,7 +638,7 @@ QT_END_NAMESPACE
 
     This property holds the names of artists contributing to the media.
 
-    \sa {QtMultimediaKit::ContributingArtist}
+    \sa {QtMultimedia::ContributingArtist}
 */
 
 /*!
@@ -646,7 +646,7 @@ QT_END_NAMESPACE
 
     This property holds the composer of the media.
 
-    \sa {QtMultimediaKit::Composer}
+    \sa {QtMultimedia::Composer}
 */
 
 /*!
@@ -654,7 +654,7 @@ QT_END_NAMESPACE
 
     This property holds the conductor of the media.
 
-    \sa {QtMultimediaKit::Conductor}
+    \sa {QtMultimedia::Conductor}
 */
 
 /*!
@@ -662,7 +662,7 @@ QT_END_NAMESPACE
 
     This property holds the lyrics to the media.
 
-    \sa {QtMultimediaKit::Lyrics}
+    \sa {QtMultimedia::Lyrics}
 */
 
 /*!
@@ -670,7 +670,7 @@ QT_END_NAMESPACE
 
     This property holds the mood of the media.
 
-    \sa {QtMultimediaKit::Mood}
+    \sa {QtMultimedia::Mood}
 */
 
 /*!
@@ -678,7 +678,7 @@ QT_END_NAMESPACE
 
     This property holds the track number of the media.
 
-    \sa {QtMultimediaKit::TrackNumber}
+    \sa {QtMultimedia::TrackNumber}
 */
 
 /*!
@@ -686,7 +686,7 @@ QT_END_NAMESPACE
 
     This property holds the number of track on the album containing the media.
 
-    \sa {QtMultimediaKit::TrackNumber}
+    \sa {QtMultimedia::TrackNumber}
 */
 
 /*!
@@ -694,7 +694,7 @@ QT_END_NAMESPACE
 
     This property holds the URL of a small cover art image.
 
-    \sa {QtMultimediaKit::CoverArtUrlSmall}
+    \sa {QtMultimedia::CoverArtUrlSmall}
 */
 
 /*!
@@ -702,7 +702,7 @@ QT_END_NAMESPACE
 
     This property holds the URL of a large cover art image.
 
-    \sa {QtMultimediaKit::CoverArtUrlLarge}
+    \sa {QtMultimedia::CoverArtUrlLarge}
 */
 
 /*!
@@ -710,7 +710,7 @@ QT_END_NAMESPACE
 
     This property holds the dimension of an image or video.
 
-    \sa {QtMultimediaKit::Resolution}
+    \sa {QtMultimedia::Resolution}
 */
 
 /*!
@@ -718,7 +718,7 @@ QT_END_NAMESPACE
 
     This property holds the pixel aspect ratio of an image or video.
 
-    \sa {QtMultimediaKit::PixelAspectRatio}
+    \sa {QtMultimedia::PixelAspectRatio}
 */
 
 /*!
@@ -726,7 +726,7 @@ QT_END_NAMESPACE
 
     This property holds the frame rate of the media's video stream.
 
-    \sa {QtMultimediaKit::VideoFrameRate}
+    \sa {QtMultimedia::VideoFrameRate}
 */
 
 /*!
@@ -735,7 +735,7 @@ QT_END_NAMESPACE
     This property holds the bit rate of the media's video stream in bits per
     second.
 
-    \sa {QtMultimediaKit::VideoBitRate}
+    \sa {QtMultimedia::VideoBitRate}
 */
 
 /*!
@@ -743,7 +743,7 @@ QT_END_NAMESPACE
 
     This property holds the encoding of the media's video stream.
 
-    \sa {QtMultimediaKit::VideoCodec}
+    \sa {QtMultimedia::VideoCodec}
 */
 
 /*!
@@ -751,7 +751,7 @@ QT_END_NAMESPACE
 
     This property holds the URL of a poster image.
 
-    \sa {QtMultimediaKit::PosterUrl}
+    \sa {QtMultimedia::PosterUrl}
 */
 
 /*!
@@ -759,7 +759,7 @@ QT_END_NAMESPACE
 
     This property holds the chapter number of the media.
 
-    \sa {QtMultimediaKit::ChapterNumber}
+    \sa {QtMultimedia::ChapterNumber}
 */
 
 /*!
@@ -767,7 +767,7 @@ QT_END_NAMESPACE
 
     This property holds the director of the media.
 
-    \sa {QtMultimediaKit::Director}
+    \sa {QtMultimedia::Director}
 */
 
 /*!
@@ -775,7 +775,7 @@ QT_END_NAMESPACE
 
     This property holds the lead performer in the media.
 
-    \sa {QtMultimediaKit::LeadPerformer}
+    \sa {QtMultimedia::LeadPerformer}
 */
 
 /*!
@@ -783,7 +783,7 @@ QT_END_NAMESPACE
 
     This property holds the writer of the media.
 
-    \sa {QtMultimediaKit::Writer}
+    \sa {QtMultimedia::Writer}
 */
 
 // The remaining properties are related to photos, and are technically
@@ -793,157 +793,157 @@ QT_END_NAMESPACE
 /*!
     \qmlproperty variant Video::metaData.cameraManufacturer
 
-    \sa {QtMultimediaKit::CameraManufacturer}
+    \sa {QtMultimedia::CameraManufacturer}
 */
 
 /*!
     \qmlproperty variant Video::metaData.cameraModel
 
-    \sa {QtMultimediaKit::CameraModel}
+    \sa {QtMultimedia::CameraModel}
 */
 
 /*!
     \qmlproperty variant Video::metaData.event
 
-    \sa {QtMultimediaKit::Event}
+    \sa {QtMultimedia::Event}
 */
 
 /*!
     \qmlproperty variant Video::metaData.subject
 
-    \sa {QtMultimediaKit::Subject}
+    \sa {QtMultimedia::Subject}
 */
 
 /*!
     \qmlproperty variant Video::metaData.orientation
 
-    \sa {QtMultimediaKit::Orientation}
+    \sa {QtMultimedia::Orientation}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureTime
 
-    \sa {QtMultimediaKit::ExposureTime}
+    \sa {QtMultimedia::ExposureTime}
 */
 
 /*!
     \qmlproperty variant Video::metaData.fNumber
 
-    \sa {QtMultimediaKit::FNumber}
+    \sa {QtMultimedia::FNumber}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureProgram
 
-    \sa {QtMultimediaKit::ExposureProgram}
+    \sa {QtMultimedia::ExposureProgram}
 */
 
 /*!
     \qmlproperty variant Video::metaData.isoSpeedRatings
 
-    \sa {QtMultimediaKit::ISOSpeedRatings}
+    \sa {QtMultimedia::ISOSpeedRatings}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureBiasValue
 
-    \sa {QtMultimediaKit::ExposureBiasValue}
+    \sa {QtMultimedia::ExposureBiasValue}
 */
 
 /*!
     \qmlproperty variant Video::metaData.dateTimeDigitized
 
-    \sa {QtMultimediaKit::DateTimeDigitized}
+    \sa {QtMultimedia::DateTimeDigitized}
 */
 
 /*!
     \qmlproperty variant Video::metaData.subjectDistance
 
-    \sa {QtMultimediaKit::SubjectDistance}
+    \sa {QtMultimedia::SubjectDistance}
 */
 
 /*!
     \qmlproperty variant Video::metaData.meteringMode
 
-    \sa {QtMultimediaKit::MeteringMode}
+    \sa {QtMultimedia::MeteringMode}
 */
 
 /*!
     \qmlproperty variant Video::metaData.lightSource
 
-    \sa {QtMultimediaKit::LightSource}
+    \sa {QtMultimedia::LightSource}
 */
 
 /*!
     \qmlproperty variant Video::metaData.flash
 
-    \sa {QtMultimediaKit::Flash}
+    \sa {QtMultimedia::Flash}
 */
 
 /*!
     \qmlproperty variant Video::metaData.focalLength
 
-    \sa {QtMultimediaKit::FocalLength}
+    \sa {QtMultimedia::FocalLength}
 */
 
 /*!
     \qmlproperty variant Video::metaData.exposureMode
 
-    \sa {QtMultimediaKit::ExposureMode}
+    \sa {QtMultimedia::ExposureMode}
 */
 
 /*!
     \qmlproperty variant Video::metaData.whiteBalance
 
-    \sa {QtMultimediaKit::WhiteBalance}
+    \sa {QtMultimedia::WhiteBalance}
 */
 
 /*!
     \qmlproperty variant Video::metaData.DigitalZoomRatio
 
-    \sa {QtMultimediaKit::DigitalZoomRatio}
+    \sa {QtMultimedia::DigitalZoomRatio}
 */
 
 /*!
     \qmlproperty variant Video::metaData.focalLengthIn35mmFilm
 
-    \sa {QtMultimediaKit::FocalLengthIn35mmFile}
+    \sa {QtMultimedia::FocalLengthIn35mmFile}
 */
 
 /*!
     \qmlproperty variant Video::metaData.sceneCaptureType
 
-    \sa {QtMultimediaKit::SceneCaptureType}
+    \sa {QtMultimedia::SceneCaptureType}
 */
 
 /*!
     \qmlproperty variant Video::metaData.gainControl
 
-    \sa {QtMultimediaKit::GainControl}
+    \sa {QtMultimedia::GainControl}
 */
 
 /*!
     \qmlproperty variant Video::metaData.contrast
 
-    \sa {QtMultimediaKit::contrast}
+    \sa {QtMultimedia::contrast}
 */
 
 /*!
     \qmlproperty variant Video::metaData.saturation
 
-    \sa {QtMultimediaKit::Saturation}
+    \sa {QtMultimedia::Saturation}
 */
 
 /*!
     \qmlproperty variant Video::metaData.sharpness
 
-    \sa {QtMultimediaKit::Sharpness}
+    \sa {QtMultimedia::Sharpness}
 */
 
 /*!
     \qmlproperty variant Video::metaData.deviceSettingDescription
 
-    \sa {QtMultimediaKit::DeviceSettingDescription}
+    \sa {QtMultimedia::DeviceSettingDescription}
 */
 
 #endif

src/imports/multimedia/qdeclarativevideooutput.cpp

@@ -46,10 +46,10 @@
 
 #include <QtDeclarative/qsgitem.h>
 
-#include <QtMultimediaKit/QAbstractVideoSurface>
-#include <QtMultimediaKit/qmediaservice.h>
-#include <QtMultimediaKit/qvideorenderercontrol.h>
-#include <QtMultimediaKit/qvideosurfaceformat.h>
+#include <QtMultimedia/QAbstractVideoSurface>
+#include <QtMultimedia/qmediaservice.h>
+#include <QtMultimedia/qvideorenderercontrol.h>
+#include <QtMultimedia/qvideosurfaceformat.h>
 
 
 #include <QtCore/qmetaobject.h>
@@ -112,11 +112,11 @@ private:
 
     \ingroup qml-multimedia
 
-    This element is part of the \bold{QtMultimediaKit 4.0} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     \qml
     import QtQuick 2.0
-    import Qt.multimediakit 4.0
+    import QtMultimedia 4.0
 
     Rectangle {
         width: 800

src/imports/multimedia/qdeclarativevideooutput_p.h

@@ -44,8 +44,8 @@
 
 #include <qsgitem.h>
 
-#include <QtMultimediaKit/qvideoframe.h>
-#include <QtMultimediaKit/qmediaobject.h>
+#include <QtMultimedia/qvideoframe.h>
+#include <QtMultimedia/qmediaobject.h>
 
 #include <QtCore/qsharedpointer.h>
 

src/imports/multimedia/qmldir.qtmultimediakit

@@ -0,0 +1 @@
+plugin declarative_multimedia ../../QtMultimedia

src/imports/multimedia/qsgvideonode_i420.h

@@ -43,7 +43,7 @@
 #define QSGVIDEONODE_I420_H
 
 #include "qsgvideonode_p.h"
-#include <QtMultimediaKit/qvideosurfaceformat.h>
+#include <QtMultimedia/qvideosurfaceformat.h>
 
 class QSGVideoMaterial_YUV420;
 class QSGVideoNode_I420 : public QSGVideoNode

src/imports/multimedia/qsgvideonode_p.h

@@ -44,8 +44,8 @@
 
 #include <QtDeclarative/qsgnode.h>
 
-#include <QtMultimediaKit/qvideoframe.h>
-#include <QtMultimediaKit/qvideosurfaceformat.h>
+#include <QtMultimedia/qvideoframe.h>
+#include <QtMultimedia/qvideosurfaceformat.h>
 #include <QtOpenGL/qglfunctions.h>
 
 class QSGVideoNode : public QSGGeometryNode

src/imports/qimportbase.pri

@@ -14,7 +14,7 @@ isEmpty(TARGET) {
 
 QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
 copy2build.input = QMLDIRFILE
-copy2build.output = $$QT.multimediakit.imports/$$TARGETPATH/qmldir
+copy2build.output = $$QT.multimedia.imports/$$TARGETPATH/qmldir
 !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
 copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 copy2build.name = COPY ${QMAKE_FILE_IN}

src/meegoinstalls/Makefile

@@ -1,40 +0,0 @@
-PKG_NAME := qt-mobility
-SPECFILE = $(addsuffix .spec, $(PKG_NAME))
-YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
-
-first: custom-help
-
-include /usr/share/meego-packaging-tools/Makefile.common
-
-custom-help: help
-	@echo "The above are common MeeGo packaging targets."
-	@echo "$(PKG_NAME) also has these additional targets:"
-	@echo " spec-git                        Create spec file, with options appropriate for git"
-	@echo " build-trunk-i686                Do a local i686 build against Trunk, without using OBS"
-	@echo " build-trunk-testing-i686        Do a local i686 build against Trunk:Testing, without using OBS"
-
-spec-git:
-	specify --skip-scm --not-download --non-interactive
-
-git-archive: spec-git
-	@VER=$$(sed -n -r -e 's|^Version: +||p' $(SPECFILE));     \
-	TARGZ=$$(sed -n -r                                        \
-	    -e 's|^Source0:.*/([^/]+)$$|\1|'                      \
-	    -e 's|%\{name\}|$(PKG_NAME)|'                         \
-	    -e "s|%\{version\}|$$VER|"                            \
-	    -e 's|.tar.gz||p'                                     \
-	$(SPECFILE) );                                            \
-	DIR="$$PWD";                                              \
-	cd $$(git rev-parse --git-dir) &&                         \
-	echo "Creating $$DIR/$$TARGZ.tar.gz ..." &&               \
-	git archive HEAD --prefix=$$TARGZ/ --format=tar | gzip > "$$DIR/$$TARGZ.tar.gz"
-
-build-no-obs = sudo build $(SPECFILE) --repository $1 --arch $2
-
-build-no-obs-deps: /usr/bin/build git-archive
-
-build-trunk-i686: build-no-obs-deps
-	$(call build-no-obs,http://download.meego.com/live/Trunk/standard/,i686)
-
-build-trunk-testing-i686: build-no-obs-deps
-	$(call build-no-obs,http://download.meego.com/live/Trunk:/Testing/standard/,i686)

src/meegoinstalls/README

@@ -1,95 +0,0 @@
-This directory contains the MeeGo.com packaging metadata for Qt Mobility,
-for use with the MeeGo.com OpenSuSE Build Service (OBS).
-
-Please see http://build.meego.com/ for more information about OBS.
-
-Quick Start: run `make' in this directory to see some useful things you
-can do.
-
-
-
-PATCHES
-=======
-
-At the time of writing, there are some MeeGo-specific patches hosted
-on the MeeGo OBS.  These patches are unable to be hosted in the Mobility
-git repository at this time.
-
-In order to successfully build Mobility for MeeGo, you must also obtain
-these patches, or you must modify qt-mobility.yaml and qt-mobility.spec
-to remove the usage of the patches.
-
-Please do not add any more patches.
-
-
-
-HOW TO MAKE CHANGES
-===================
-
-Within this directory, there is a yaml file and a spec file.  The yaml
-file is maintained by hand; the spec file is partially generated from the
-yaml file, but partially maintained by hand also, in specially marked
-sections.
-
-The command used to generate the spec file from the yaml file is `specify'.
-This is part of a tool named Spectacle.  This can be installed from the
-MeeGo tools repositories.  It does not require a full MeeGo SDK install.
-For example, on Ubuntu:
-
-  $ sudo /bin/sh -c 'echo deb http://repo.meego.com/MeeGo/tools/repos/ubuntu/10.04/ / > /etc/apt/sources.list.d/meego-tools.list'
-  $ gpg --keyserver pgpkeys.mit.edu --recv 0BC7BEC479FC1F8A && gpg --export --armor 0BC7BEC479FC1F8A | sudo apt-key add -
-  $ sudo apt-get update
-  $ sudo apt-get install meego-packaging-tools
-
-Once you have installed meego-packaging-tools, you can run `make spec-git'
-in this directory to regenerate the spec file from the yaml file.
-The spec file and yaml file should be maintained together, so if you
-modify the yaml file, you should do `make spec-git' and put the
-modifications to the spec file in the same commit.
-
-Please see http://wiki.meego.com/Spectacle for more information about
-spectacle.
-
-
-
-HOW TO BUILD
-============
-
-Note: these instructions are not canonical or supported in any way.
-They are here as a quick start for people who want to contribute to
-Qt Mobility and do not know how to compile for MeeGo.
-
-The most accurate way to build is to use the OpenSuSE build service
-on build.meego.com.  Unfortunately, at time of writing, anonymous
-access to this service is not available.  Therefore, using build.meego.com
-is not an option for most people.
-
-However, a fairly accurate build can still be done using the `build' command
-and referring to the live MeeGo repos.
-
-
-Abbreviated example of how to install `build' for Ubuntu:
-
-  $ sudo /bin/sh -c 'echo deb http://repo.meego.com/MeeGo/tools/repos/ubuntu/10.04/ / > /etc/apt/sources.list.d/meego-tools.list'
-  $ gpg --keyserver pgpkeys.mit.edu --recv 0BC7BEC479FC1F8A && gpg --export --armor 0BC7BEC479FC1F8A | sudo apt-key add -
-  $ sudo apt-get update
-  $ sudo apt-get install build
-  $ gpg --keyserver pgpkeys.mit.edu --recv 79FC1F8A && gpg --export --armor 79FC1F8A | sudo rpm --import -
-
-
-Then, to do the build (for i686):
-
-  $ make build-trunk-i686
-
-
-Or, to use the Trunk:Testing repository (which may contain newer versions of some packages):
-
-  $ make build-trunk-testing-i686
-
-
-These builds will take place in a chroot, and hence will require root access.
-They will attempt to use `sudo' for this.
-
-If you hit an error, `rpm: error while loading shared libraries: liblua-5.1.so',
-edit /usr/lib/build/configs/default.conf and add liblua to one of the `Preinstall:' lines
-(see http://comments.gmane.org/gmane.comp.handhelds.meego.devel/7139 )

src/meegoinstalls/qt-mobility.yaml

@@ -1,353 +0,0 @@
-Name: qt-mobility
-Summary: APIs for mobile device functionality
-Version: 1.1.0+git2438
-Release: 1
-Group: System/Libraries
-License: LGPLv2.1 with exception or GPLv3
-URL: http://qt.gitorious.org/qt-mobility
-Sources:
-    - http://get.qt.nokia.com/qt/add-ons/%{name}-opensource-src-%{version}.tar.gz
-SourcePrefix: "%{name}-opensource-src-%{version}"
-Patches:
-Description: |
-    Qt Mobility delivers a set of new APIs for mobile device functionality. These
-    APIs allow the developer to use these features with ease from one framework and
-    apply them to phones, netbooks and non-mobile personal computers.
-Requires:
-    - libqtconnectivity1 = %{version}
-    - libqtcontacts1 = %{version}
-    - libqtfeedback1 = %{version}
-    - libqtgallery1 = %{version}
-    - libqtlocation1 = %{version}
-    - libqtmessaging1 = %{version}
-    - libqtmultimediakit1 = %{version}
-    - libqtorganizer1 = %{version}
-    - libqtpublishsubscribe1 = %{version}
-    - libqtsensors1 = %{version}
-    - libqtserviceframework1 = %{version}
-    - libqtsysteminfo1 = %{version}
-    - libqtversit1 = %{version}
-    - libqtversitorganizer1 = %{version}
-PkgConfigBR:
-    - QtGui
-    - QtOpenGL
-    - alsa
-    - blkid
-    - bluez
-    - connman
-    - contextsubscriber-1.0
-    - gconf-2.0
-    - geoclue
-    - gstreamer-plugins-bad-free-0.10
-    - gstreamer-plugins-base-0.10
-    - gypsy
-    - libiphb
-    - libpulse
-    - libmkcal
-    - meegotouch
-    - qttracker
-    - qmfclient
-    - sensord
-    - udev
-    - x11
-    - xext
-    - xrandr
-    - xrender
-    - xv
-    - QtSparql
-    - QtSparqlTrackerExtensions
-PkgBR:
-    - qt-devel-tools
-Configure: none
-Builder: none
-RunFdupes: "%{_datadir}/qtmobility/translations"
-SubPackages:
-    - Name: devel
-      Summary: APIs for mobile device functionality - development files
-      Group: Development/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the development files needed to build Qt applications
-          using Qt Mobility libraries.
-      Requires:
-          - servicefw
-
-    - Name: libqtconnectivity1
-      AsWholeName: yes
-      Summary: Qt Mobility Connectivity module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Connectivity API. It provides APIs for working with
-          local devices.
-
-    - Name: libqtcontacts1
-      AsWholeName: yes
-      Summary: Qt Mobility Contacts module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains an API enabling clients to request contact data from
-          local or remote backends.
-
-    - Name: libqtfeedback1
-      AsWholeName: yes
-      Summary: Qt Mobility Feedback module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Feedback API. It enables a client to control
-          the vibration of the device or the piezo feedback from the screen.
-
-    - Name: libqtgallery1
-      AsWholeName: yes
-      Summary: Qt Mobility Document Gallery module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains an API for accessing collections of documents and media
-          and their meta-data.
-
-    - Name: libqtlocation1
-      AsWholeName: yes
-      Summary: Qt Mobility Location module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Location API. It provides a library for distributing
-          and receiving location data using arbitrary data sources.
-
-    - Name: libqtmessaging1
-      AsWholeName: yes
-      Summary: Qt Mobility Messaging module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Messaging API. It is a common interface for handling
-          SMS, MMS, MIME Email and TNEF Email messages.
-
-    - Name: libqtmultimediakit1
-      AsWholeName: yes
-      Summary: Qt Mobility MultimediaKit module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains a set of APIs to play and record media, and manage a
-          collection of media content.
-
-    - Name: libqtorganizer1
-      AsWholeName: yes
-      Summary: Qt Mobility Organizer module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains an API for management of calendar, scheduling and
-          personal data from local or remote backends. It includes the ability to create,
-          edit, list, delete and lookup organizer information whether it is stored
-          locally or remotely.
-
-    - Name: libqtpublishsubscribe1
-      AsWholeName: yes
-      Summary: Qt Mobility Publish and Subscribe module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Publish and Subscribe API (containing Value Space).
-          It enables applications to read item values, navigate through and subscribe to
-          change notifications.
-
-    - Name: libqtsensors1
-      AsWholeName: yes
-      Summary: Qt Mobility Sensors module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Sensors API. It provides access to sensors.
-      Requires:
-          - libqtsql4-sqlite
-          - sensorfw
-
-    - Name: libqtserviceframework1
-      AsWholeName: yes
-      Summary: Qt Mobility Service Framework module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains a set of APIs to that allows clients to discover and
-          instantiate arbitrary services.
-
-    - Name: libqtsysteminfo1
-      AsWholeName: yes
-      Summary: Qt Mobility System Information module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains a set of APIs to discover system related information and
-          capabilities.
-
-    - Name: libqtversit1
-      AsWholeName: yes
-      Summary: Qt Mobility Versit (vCard) module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains an API to manage Versit documents, such as vCards.
-
-    - Name: libqtversitorganizer1
-      AsWholeName: yes
-      Summary: Qt Mobility Versit (Organizer) module
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains an API to manage Versit documents, such as iCalendar
-          documents. It interfaces the Organizer API and uses the same framework as for
-          vCards.
-
-    - Name: libdeclarative-contacts
-      AsWholeName: yes
-      Summary: Qt Mobility Contacts QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Contacts QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-feedback
-      AsWholeName: yes
-      Summary: Qt Mobility Feedback QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Feedback QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-gallery
-      AsWholeName: yes
-      Summary: Qt Mobility Document Gallery QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Document Gallery QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-location
-      AsWholeName: yes
-      Summary: Qt Mobility Location QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Location QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-messaging
-      AsWholeName: yes
-      Summary: Qt Mobility Messaging QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Messaging QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-multimedia
-      AsWholeName: yes
-      Summary: Qt Mobility Multimedia QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Multimedia QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-organizer
-      AsWholeName: yes
-      Summary: Qt Mobility Organizer QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Organizer QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-publishsubscribe
-      AsWholeName: yes
-      Summary: Qt Mobility Publish and Subscribe QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Publish and Subscribe QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-sensors
-      AsWholeName: yes
-      Summary: Qt Mobility Sensors Framework QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Sensors QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-serviceframework
-      AsWholeName: yes
-      Summary: Qt Mobility Service Framework QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Service Framework QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-systeminfo
-      AsWholeName: yes
-      Summary: Qt Mobility System Information QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the System Information QML plugin for QtDeclarative.
-
-    - Name: libdeclarative-connectivity
-      AsWholeName: yes
-      Summary: Qt Mobility Connectivity QML plugin
-      Group: System/Libraries
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Connectivity QML plugin for QtDeclarative.
-
-    - Name: servicefw
-      AsWholeName: yes
-      Summary: Qt Mobility Service Framework tool
-      Group: Development/Tools
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains the Service Framework tool (servicefw). It allows
-          to register services and make them available over the Service Framework.
-
-    - Name: examples
-      Summary: Qt Mobility examples
-      Group: System/X11
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains Qt Mobility examples.
-
-    - Name: l10n
-      Summary: APIs for mobile device functionality - localization files
-      Group: System/I18n
-      Description: |
-          Qt Mobility delivers a set of new APIs for mobile device functionality.
-
-          This package contains Qt Mobility translations.

src/multimedia/audio/qaudio.cpp

@@ -65,7 +65,7 @@ public:
 /*
     \namespace QAudio
     \brief The QAudio namespace contains enums used by the audio classes.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
 */
 

src/multimedia/audio/qaudio.h

@@ -43,7 +43,7 @@
 #ifndef QAUDIO_H
 #define QAUDIO_H
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include <QtCore/qmetatype.h>

src/multimedia/audio/qaudiodevicefactory_p.h

@@ -56,7 +56,7 @@
 #include <QtCore/qbytearray.h>
 #include <QtCore/qlist.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include "qaudiodeviceinfo.h"

src/multimedia/audio/qaudiodeviceinfo.cpp

@@ -93,7 +93,7 @@ public:
 /*!
     \class QAudioDeviceInfo
     \brief The QAudioDeviceInfo class provides an interface to query audio devices and their functionality.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
 
     QAudioDeviceInfo lets you query for audio devices--such as sound

src/multimedia/audio/qaudiodeviceinfo.h

@@ -49,7 +49,7 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qlist.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include <qaudio.h>

src/multimedia/audio/qaudioformat.cpp

@@ -92,7 +92,7 @@ public:
     \class QAudioFormat
     \brief The QAudioFormat class stores audio stream parameter information.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup  multimedia
     \since 1.0
 

src/multimedia/audio/qaudioformat.h

@@ -46,7 +46,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 QT_BEGIN_HEADER

src/multimedia/audio/qaudioinput.cpp

@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \class QAudioInput
     \brief The QAudioInput class provides an interface for receiving audio data from an audio input device.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup  multimedia
     \since 1.0
 

src/multimedia/audio/qaudioinput.h

@@ -45,7 +45,7 @@
 
 #include <QtCore/qiodevice.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include <qaudio.h>

src/multimedia/audio/qaudioinput_mac_p.cpp

@@ -63,7 +63,7 @@
 QT_BEGIN_NAMESPACE
 
 
-namespace QtMultimediaKitInternal
+namespace QtMultimediaInternal
 {
 
 static const int default_buffer_size = 4 * 1024;
@@ -526,7 +526,7 @@ QAudioInputPrivate::QAudioInputPrivate(const QByteArray& device)
         startTime = 0;
         totalFrames = 0;
         audioBuffer = 0;
-        internalBufferSize = QtMultimediaKitInternal::default_buffer_size;
+        internalBufferSize = QtMultimediaInternal::default_buffer_size;
         clockFrequency = AudioGetHostClockFrequency() / 1000;
         errorCode = QAudio::NoError;
         stateCode = QAudio::StoppedState;
@@ -677,13 +677,13 @@ bool QAudioInputPrivate::open()
     else
         internalBufferSize -= internalBufferSize % streamFormat.mBytesPerFrame;
 
-    audioBuffer = new QtMultimediaKitInternal::QAudioInputBuffer(internalBufferSize,
+    audioBuffer = new QtMultimediaInternal::QAudioInputBuffer(internalBufferSize,
                                         periodSizeBytes,
                                         deviceFormat,
                                         streamFormat,
                                         this);
 
-    audioIO = new QtMultimediaKitInternal::MacInputDevice(audioBuffer, this);
+    audioIO = new QtMultimediaInternal::MacInputDevice(audioBuffer, this);
 
     // Init
     if (AudioUnitInitialize(audioUnit) != noErr) {

src/multimedia/audio/qaudioinput_mac_p.h

@@ -79,7 +79,7 @@ class QTimer;
 class QIODevice;
 class QAbstractAudioDeviceInfo;
 
-namespace QtMultimediaKitInternal
+namespace QtMultimediaInternal
 {
 class QAudioInputBuffer;
 }
@@ -101,7 +101,7 @@ public:
     UInt64          startTime;
     QAudio::Error   errorCode;
     QAudio::State   stateCode;
-    QtMultimediaKitInternal::QAudioInputBuffer*   audioBuffer;
+    QtMultimediaInternal::QAudioInputBuffer*   audioBuffer;
     QMutex          mutex;
     QWaitCondition  threadFinished;
     QAtomicInt      audioThreadState;

src/multimedia/audio/qaudiooutput.cpp

@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
     \class QAudioOutput
     \brief The QAudioOutput class provides an interface for sending audio data to an audio output device.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup  multimedia
     \since 1.0
 

src/multimedia/audio/qaudiooutput.h

@@ -45,7 +45,7 @@
 
 #include <QtCore/qiodevice.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include <qaudio.h>

src/multimedia/audio/qaudiooutput_mac_p.cpp

@@ -70,7 +70,7 @@
 QT_BEGIN_NAMESPACE
 
 
-namespace QtMultimediaKitInternal
+namespace QtMultimediaInternal
 {
 
 static const int default_buffer_size = 8 * 1024;
@@ -243,7 +243,7 @@ class MacOutputDevice : public QIODevice
     Q_OBJECT
 
 public:
-    MacOutputDevice(QtMultimediaKitInternal::QAudioOutputBuffer* audioBuffer, QObject* parent):
+    MacOutputDevice(QtMultimediaInternal::QAudioOutputBuffer* audioBuffer, QObject* parent):
         QIODevice(parent),
         m_audioBuffer(audioBuffer)
     {
@@ -269,7 +269,7 @@ public:
     }
 
 private:
-    QtMultimediaKitInternal::QAudioOutputBuffer*    m_audioBuffer;
+    QtMultimediaInternal::QAudioOutputBuffer*    m_audioBuffer;
 };
 
 
@@ -291,7 +291,7 @@ QAudioOutputPrivate::QAudioOutputPrivate(const QByteArray& device)
         startTime = 0;
         totalFrames = 0;
         audioBuffer = 0;
-        internalBufferSize = QtMultimediaKitInternal::default_buffer_size;
+        internalBufferSize = QtMultimediaInternal::default_buffer_size;
         clockFrequency = AudioGetHostClockFrequency() / 1000;
         errorCode = QAudio::NoError;
         stateCode = QAudio::StoppedState;
@@ -395,7 +395,7 @@ bool QAudioOutputPrivate::open()
     else
         internalBufferSize -= internalBufferSize % streamFormat.mBytesPerFrame;
 
-    audioBuffer = new QtMultimediaKitInternal::QAudioOutputBuffer(internalBufferSize, periodSizeBytes, audioFormat);
+    audioBuffer = new QtMultimediaInternal::QAudioOutputBuffer(internalBufferSize, periodSizeBytes, audioFormat);
     connect(audioBuffer, SIGNAL(readyRead()), SLOT(inputReady()));  // Pull
 
     audioIO = new MacOutputDevice(audioBuffer, this);

src/multimedia/audio/qaudiooutput_mac_p.h

@@ -78,7 +78,7 @@ QT_MODULE(Multimedia)
 class QIODevice;
 class QAbstractAudioDeviceInfo;
 
-namespace QtMultimediaKitInternal
+namespace QtMultimediaInternal
 {
 class QAudioOutputBuffer;
 }
@@ -100,7 +100,7 @@ public:
     UInt64          startTime;
     AudioStreamBasicDescription deviceFormat;
     AudioStreamBasicDescription streamFormat;
-    QtMultimediaKitInternal::QAudioOutputBuffer*   audioBuffer;
+    QtMultimediaInternal::QAudioOutputBuffer*   audioBuffer;
     QAtomicInt      audioThreadState;
     QWaitCondition  threadFinished;
     QMutex          mutex;

src/multimedia/audio/qaudiopluginloader_p.h

@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <QObject>
 #include <QtCore/qstring.h>
 #include <QtCore/qmap.h>

src/multimedia/audio/qaudiosystem.cpp

@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
     \brief The QAbstractAudioDeviceInfo class is a base class for audio backends.
 
     \ingroup multimedia
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \internal
     \since 1.0
 
@@ -123,7 +123,7 @@ QT_BEGIN_NAMESPACE
     \since 1.0
 
     \ingroup multimedia
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \internal
 
     QAbstractAudioOutput implements audio functionality for
@@ -287,7 +287,7 @@ QT_BEGIN_NAMESPACE
     \since 1.0
 
     \ingroup multimedia
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \internal
 
     QAudioDeviceInput keeps an instance of QAbstractAudioInput and

src/multimedia/audio/qaudiosystem.h

@@ -42,7 +42,7 @@
 #ifndef QAUDIOSYSTEM_H
 #define QAUDIOSYSTEM_H
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include "qaudio.h"

src/multimedia/audio/qaudiosystemplugin.cpp

@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \since 1.0
 
     \ingroup multimedia
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \internal
 
     Writing a audio plugin is achieved by subclassing this base class,
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
     \sa QAbstractAudioDeviceInfo, QAbstractAudioOutput, QAbstractAudioInput
 
     Qt supports win32, linux(alsa) and Mac OS X standard (builtin to the
-    QtMultimediaKit library at compile time).
+    QtMultimedia library at compile time).
 
     You can support other backends other than these predefined ones by
     creating a plugin subclassing QAudioSystemPlugin, QAbstractAudioDeviceInfo,
@@ -73,11 +73,11 @@ QT_BEGIN_NAMESPACE
     audio device to be provided by your plugin.
 
     -audio-backend configure option will force compiling in of the builtin backend
-    into the QtMultimediaKit library at compile time. This is automatic by default
+    into the QtMultimedia library at compile time. This is automatic by default
     and will only be compiled into the library if the dependencies are installed.
     eg. alsa-devel package installed for linux.
 
-    If the builtin backend is not compiled into the QtMultimediaKit library and
+    If the builtin backend is not compiled into the QtMultimedia library and
     no audio plugins are available a fallback dummy backend will be used.
     This should print out warnings if this is the case when you try and use QAudioInput or QAudioOutput. To fix this problem
     reconfigure Qt using -audio-backend or create your own plugin with a default

src/multimedia/audio/qaudiosystemplugin.h

@@ -47,7 +47,7 @@
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <qtmedianamespace.h>
 
 #include "qaudioformat.h"

src/multimedia/effects/qsoundeffect.cpp

@@ -56,9 +56,9 @@ QT_BEGIN_NAMESPACE
     \brief The SoundEffect element provides a way to play sound effects in QML.
     \since 1.0
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
 
-    This element is part of the \bold{QtMultimediaKit 1.1} module.
+    This element is part of the \bold{QtMultimedia 4.0} module.
 
     The following example plays a WAV file on mouse click.
 

src/multimedia/effects/qsoundeffect_p.h

@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <qtmultimediakitdefs.h>
+#include <qtmultimediadefs.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qstringlist.h>

src/multimedia/multimedia.pro

@@ -1,12 +1,11 @@
 load(qt_module)
 
-# distinct from QtMultimedia
-TARGET = QtMultimediaKit
+TARGET = QtMultimedia
 QPRO_PWD = $$PWD
 QT = core network gui
 
 CONFIG += module
-MODULE_PRI += ../../modules/qt_multimediakit.pri
+MODULE_PRI += ../../modules/qt_multimedia.pri
 
 contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
 } else {
@@ -18,7 +17,7 @@ DEFINES += QT_BUILD_MULTIMEDIA_LIB
 
 load(qt_module_config)
 
-HEADERS += qtmultimediakitversion.h
+HEADERS += qtmultimediaversion.h
 
 
 PRIVATE_HEADERS += \
@@ -71,7 +70,7 @@ PUBLIC_HEADERS += \
     qmediatimerange.h \
     qmedianetworkaccesscontrol.h \
     qmediaenumdebug.h \
-    qtmultimediakitdefs.h
+    qtmultimediadefs.h
 
 SOURCES += qmediacontrol.cpp \
     qmediaobject.cpp \

src/multimedia/qaudiocapturesource.cpp

@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QAudioCaptureSource
     \brief The QAudioCaptureSource class provides an interface to query and select an audio input endpoint.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 
@@ -93,14 +93,14 @@ public:
                        SIGNAL(availableAudioInputsChanged()));
             q->connect(audioEndpointSelector, SIGNAL(availableEndpointsChanged()),
                        SLOT(statusChanged()));
-            errorState = QtMultimediaKit::NoError;
+            errorState = QtMultimedia::NoError;
         }
     }
 
-    QAudioCaptureSourcePrivate():provider(0), audioEndpointSelector(0), errorState(QtMultimediaKit::ServiceMissingError) {}
+    QAudioCaptureSourcePrivate():provider(0), audioEndpointSelector(0), errorState(QtMultimedia::ServiceMissingError) {}
     QMediaServiceProvider *provider;
     QAudioEndpointSelector   *audioEndpointSelector;
-    QtMultimediaKit::AvailabilityError errorState;
+    QtMultimedia::AvailabilityError errorState;
 };
 
 /*!
@@ -137,7 +137,7 @@ QAudioCaptureSource::~QAudioCaptureSource()
     \since 1.0
 */
 
-QtMultimediaKit::AvailabilityError QAudioCaptureSource::availabilityError() const
+QtMultimedia::AvailabilityError QAudioCaptureSource::availabilityError() const
 {
     Q_D(const QAudioCaptureSource);
 
@@ -258,14 +258,14 @@ void QAudioCaptureSource::statusChanged()
 
     if (d->audioEndpointSelector) {
         if (d->audioEndpointSelector->availableEndpoints().size() > 0) {
-            d->errorState = QtMultimediaKit::NoError;
+            d->errorState = QtMultimedia::NoError;
             emit availabilityChanged(true);
         } else {
-            d->errorState = QtMultimediaKit::BusyError;
+            d->errorState = QtMultimedia::BusyError;
             emit availabilityChanged(false);
         }
     } else {
-        d->errorState = QtMultimediaKit::ServiceMissingError;
+        d->errorState = QtMultimedia::ServiceMissingError;
         emit availabilityChanged(false);
     }
 }

src/multimedia/qaudiocapturesource.h

@@ -73,7 +73,7 @@ public:
     ~QAudioCaptureSource();
 
     bool isAvailable() const;
-    QtMultimediaKit::AvailabilityError availabilityError() const;
+    QtMultimedia::AvailabilityError availabilityError() const;
 
     QList<QString> audioInputs() const;
 

src/multimedia/qaudioencodercontrol.cpp

@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QAudioEncoderControl
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.0
 

src/multimedia/qaudioendpointselector.cpp

@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \class QAudioEndpointSelector
 
     \brief The QAudioEndpointSelector class provides an audio endpoint selector media control.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
     \since 1.0
 

src/multimedia/qaudionamespace.qdoc

@@ -30,7 +30,7 @@
 /*!
     \namespace QAudio
     \brief The QAudio namespace contains enums used by the audio classes.
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia
 */
 

src/multimedia/qcamera.cpp

@@ -81,7 +81,7 @@ public:
 
     \brief The QCamera class provides interface for system camera devices.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup camera
     \since 1.1
 
@@ -412,7 +412,7 @@ QCamera::~QCamera()
 */
 bool QCamera::isAvailable() const
 {
-    return availabilityError() == QtMultimediaKit::NoError;
+    return availabilityError() == QtMultimedia::NoError;
 }
 
 /*!
@@ -420,19 +420,19 @@ bool QCamera::isAvailable() const
     \since 1.1
 */
 
-QtMultimediaKit::AvailabilityError QCamera::availabilityError() const
+QtMultimedia::AvailabilityError QCamera::availabilityError() const
 {
     Q_D(const QCamera);
     if (d->control == NULL)
-        return QtMultimediaKit::ServiceMissingError;
+        return QtMultimedia::ServiceMissingError;
 
     if (d->deviceControl && d->deviceControl->deviceCount() == 0)
-        return QtMultimediaKit::ResourceError;
+        return QtMultimedia::ResourceError;
 
     if (d->error != QCamera::NoError)
-        return QtMultimediaKit::ResourceError;
+        return QtMultimedia::ResourceError;
 
-    return QtMultimediaKit::NoError;
+    return QtMultimedia::NoError;
 }
 
 

src/multimedia/qcamera.h

@@ -150,7 +150,7 @@ public:
     static QString deviceDescription(const QByteArray &device);
 
     bool isAvailable() const;
-    QtMultimediaKit::AvailabilityError availabilityError() const;
+    QtMultimedia::AvailabilityError availabilityError() const;
 
     State state() const;
     Status status() const;

src/multimedia/qcameracapturebufferformatcontrol.cpp

@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
     The format is of type QVideoFrame::PixelFormat.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
 
     The interface name of QCameraCaptureBufferFormatControl is \c com.nokia.Qt.QCameraCaptureBufferFormatControl/1.0 as

src/multimedia/qcameracapturedestinationcontrol.cpp

@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
     Depending on backend capabilities capture to file, buffer or both can be supported.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
 
 

src/multimedia/qcameracontrol.cpp

@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \brief The QCameraControl class is an abstract base class for
     classes that control still cameras or video cameras.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.1
 

src/multimedia/qcameraexposure.cpp

@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
     \brief The QCameraExposure class provides interface for exposure related camera settings.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup camera
     \since 1.1
 

src/multimedia/qcameraexposurecontrol.cpp

@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
     \brief The QCameraExposureControl class allows controlling camera exposure parameters.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.1
 

src/multimedia/qcameraflashcontrol.cpp

@@ -50,10 +50,10 @@ QT_BEGIN_NAMESPACE
     \brief The QCameraFlashControl class allows controlling a camera's flash.
 
     \ingroup multimedia-serv
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \since 1.1
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
 
     You can set the type of flash effect used when an image is captured, and test to see
     if the flash hardware is ready to fire.

src/multimedia/qcamerafocus.cpp

@@ -170,7 +170,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status)
     \brief The QCameraFocus class provides interface for
     focus and zoom related camera settings.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup camera
     \since 1.1
 

src/multimedia/qcamerafocuscontrol.cpp

@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     \brief The QCameraFocusControl class supplies control for
     focusing related camera parameters.
 
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup multimedia-serv
     \since 1.1
 

src/multimedia/qcameraimagecapture.cpp

@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraImageCapture
-    \inmodule QtMultimediaKit
+    \inmodule QtMultimedia
     \ingroup camera
     \since 1.1
 
@@ -205,8 +205,8 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject)
                        this, SIGNAL(imageCaptured(int,QImage)));
             disconnect(d->control, SIGNAL(imageAvailable(int,QVideoFrame)),
                        this, SIGNAL(imageAvailable(int,QVideoFrame)));
-            disconnect(d->control, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)),
-                       this, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)));
+            disconnect(d->control, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)),
+                       this, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)));
             disconnect(d->control, SIGNAL(imageMetadataAvailable(int,QString,QVariant)),
                        this, SIGNAL(imageMetadataAvailable(int,QString,QVariant)));
             disconnect(d->control, SIGNAL(imageSaved(int,QString)),
@@ -257,8 +257,8 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject)
                         this, SIGNAL(imageExposed(int)));
                 connect(d->control, SIGNAL(imageCaptured(int,QImage)),
                         this, SIGNAL(imageCaptured(int,QImage)));
-                connect(d->control, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)),
-                        this, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)));
+                connect(d->control, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)),
+                        this, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)));
                 connect(d->control, SIGNAL(imageMetadataAvailable(int,QString,QVariant)),
                         this, SIGNAL(imageMetadataAvailable(int,QString,QVariant)));
                 connect(d->control, SIGNAL(imageAvailable(int,QVideoFrame)),
@@ -313,12 +313,12 @@ bool QCameraImageCapture::isAvailable() const
     Returns the availability error code.
     \since 1.1
 */
-QtMultimediaKit::AvailabilityError QCameraImageCapture::availabilityError() const
+QtMultimedia::AvailabilityError QCameraImageCapture::availabilityError() const
 {
     if (d_func()->control != NULL)
-        return QtMultimediaKit::NoError;
+        return QtMultimedia::NoError;
     else
-        return QtMultimediaKit::ServiceMissingError;
+        return QtMultimedia::ServiceMissingError;
 }
 
 /*!
@@ -641,10 +641,10 @@ void QCameraImageCapture::cancelCapture()
 */
 
 /*!
-    \fn QCameraImageCapture::imageMetadataAvailable(int id, QtMultimediaKit::MetaData key, const QVariant &value)
+    \fn QCameraImageCapture::imageMetadataAvailable(int id, QtMultimedia::MetaData key, const QVariant &value)
 
     Signals that a metadata for an image with request \a id is available.
-    This signal is emitted for metadata \a value with a \a key listed in QtMultimediaKit::MetaData enum.
+    This signal is emitted for metadata \a value with a \a key listed in QtMultimedia::MetaData enum.
 
     This signal is emitted between imageExposed and imageSaved signals.
     \since 1.2
@@ -654,7 +654,7 @@ void QCameraImageCapture::cancelCapture()
     \fn QCameraImageCapture::imageMetadataAvailable(int id, const QString &key, const QVariant &value)
 
     Signals that a metadata for an image with request \a id is available.
-    This signal is emitted for extended metadata \a value with a \a key not listed in QtMultimediaKit::MetaData enum.
+    This signal is emitted for extended metadata \a value with a \a key not listed in QtMultimedia::MetaData enum.
 
     This signal is emitted between imageExposed and imageSaved signals.
     \since 1.2

src/multimedia/qcameraimagecapture.h

@@ -97,7 +97,7 @@ public:
     ~QCameraImageCapture();
 
     bool isAvailable() const;
-    QtMultimediaKit::AvailabilityError availabilityError() const;
+    QtMultimedia::AvailabilityError availabilityError() const;
 
     QMediaObject *mediaObject() const;
 
@@ -136,7 +136,7 @@ Q_SIGNALS:
 
     void imageExposed(int id);
     void imageCaptured(int id, const QImage &preview);
-    void imageMetadataAvailable(int id, QtMultimediaKit::MetaData key, const QVariant &value);
+    void imageMetadataAvailable(int id, QtMultimedia::MetaData key, const QVariant &value);
     void imageMetadataAvailable(int id, const QString &key, const QVariant &value);
     void imageAvailable(int id, const QVideoFrame &image);
     void imageSaved(int id, const QString &fileName);