Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
	src/src.pro

34 files changed, 107 insertions, 212 deletions

diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 724f3e00cb..21f308d592 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/tools/qsimd_p.h
@@ -47,9 +47,6 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Core)
 
 #if defined(QT_NO_MAC_XARCH) || (defined(Q_OS_DARWIN) && (defined(__ppc__) || defined(__ppc64__)))
 // Disable MMX and SSE on Mac/PPC builds, or if the compiler
@@ -103,6 +100,10 @@ QT_MODULE(Core)
 #include <mm3dnow.h>
 #endif
 
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Core)
+
 enum CPUFeatures {
     None        = 0,
     MMX         = 0x1,
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index 9560952e18..c776b2ad28 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -373,7 +373,7 @@ QMacTabletHash *qt_mac_tablet_hash()
 // Clears the QWidget pointer that each QCocoaView holds.
 void qt_mac_clearCocoaViewQWidgetPointers(QWidget *widget)
 {
-    QCocoaView *cocoaView = reinterpret_cast<QCocoaView *>(qt_mac_nativeview_for(widget));
+    QT_MANGLE_NAMESPACE(QCocoaView) *cocoaView = reinterpret_cast<QT_MANGLE_NAMESPACE(QCocoaView) *>(qt_mac_nativeview_for(widget));
     if (cocoaView && [cocoaView respondsToSelector:@selector(qt_qwidget)]) {
         [cocoaView qt_clearQWidget];
     }
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 8becbf3bc0..a2e74f4729 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -41,17 +41,27 @@
 
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
 #include <QtDeclarative/qdeclarative.h>
-#include <QtMultimedia/multimediadeclarative.h>
+#include <QtMultimedia/private/qsoundeffect_p.h>
+
+#include "qdeclarativevideo_p.h"
+#include "qdeclarativeaudio_p.h"
+
+
+QML_DECLARE_TYPE(QSoundEffect)
 
 QT_BEGIN_NAMESPACE
 
-class QMultimediaQmlModule : public QDeclarativeExtensionPlugin
+class QMultimediaDeclarativeModule : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
     virtual void registerTypes(const char *uri)
     {
-        QtMultimedia::qRegisterDeclarativeElements(uri);
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimedia"));
+
+        qmlRegisterType<QSoundEffect>(uri, 4, 7, "SoundEffect");
+        qmlRegisterType<QDeclarativeAudio>(uri, 4, 7, "Audio");
+        qmlRegisterType<QDeclarativeVideo>(uri, 4, 7, "Video");
     }
 };
 
@@ -59,5 +69,5 @@ QT_END_NAMESPACE
 
 #include "multimedia.moc"
 
-Q_EXPORT_PLUGIN2(qmultimediaqmlmodule, QT_PREPEND_NAMESPACE(QMultimediaQmlModule));
+Q_EXPORT_PLUGIN2(qmultimediadeclarativemodule, QT_PREPEND_NAMESPACE(QMultimediaDeclarativeModule));
 
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index ad2ce1b41a..117aa9b6fc 100644
--- a/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -4,7 +4,18 @@ include(../qimportbase.pri)
 
 QT += multimedia declarative
 
-SOURCES += multimedia.cpp
+HEADERS += \
+        qdeclarativeaudio_p.h \
+        qdeclarativemediabase_p.h \
+        qdeclarativevideo_p.h \
+        qmetadatacontrolmetaobject_p.h \
+
+SOURCES += \
+        multimedia.cpp \
+        qdeclarativeaudio.cpp \
+        qdeclarativemediabase.cpp \
+        qdeclarativevideo.cpp \
+        qmetadatacontrolmetaobject.cpp
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/Qt/multimedia
 target.path = $$TARGETPATH
diff --git a/src/multimedia/effects/effects.pri b/src/multimedia/effects/effects.pri
new file mode 100644
index 0000000000..5edd452659
--- /dev/null
+++ b/src/multimedia/effects/effects.pri
@@ -0,0 +1,24 @@
+
+
+
+system(pkg-config --exists \'libpulse >= 0.9.10\') {
+    DEFINES += QT_MULTIMEDIA_PULSEAUDIO
+    HEADERS += $$PWD/qsoundeffect_pulse_p.h
+    SOURCES += $$PWD/qsoundeffect_pulse_p.cpp
+    LIBS += -lpulse
+} else:x11 {
+    DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
+    HEADERS += $$PWD/qsoundeffect_qmedia_p.h
+    SOURCES += $$PWD/qsoundeffect_qmedia_p.cpp
+} else {
+    HEADERS += $$PWD/qsoundeffect_qsound_p.h
+    SOURCES += $$PWD/qsoundeffect_qsound_p.cpp
+}
+
+HEADERS += \
+    $$PWD/qsoundeffect_p.h \
+    $$PWD/wavedecoder_p.h
+
+SOURCES += \
+    $$PWD/qsoundeffect.cpp \
+    $$PWD/wavedecoder_p.cpp
diff --git a/src/multimedia/qml/qsoundeffect.cpp b/src/multimedia/effects/qsoundeffect.cpp
index 541e6c9ccd..541e6c9ccd 100644
--- a/src/multimedia/qml/qsoundeffect.cpp
+++ b/src/multimedia/effects/qsoundeffect.cpp
diff --git a/src/multimedia/qml/qsoundeffect_p.h b/src/multimedia/effects/qsoundeffect_p.h
index 51ebe52abb..c5554bf8a1 100644
--- a/src/multimedia/qml/qsoundeffect_p.h
+++ b/src/multimedia/effects/qsoundeffect_p.h
@@ -56,7 +56,6 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
-#include <QtDeclarative/qdeclarative.h>
 
 
 QT_BEGIN_HEADER
@@ -64,7 +63,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QSoundEffectPrivate;
-class Q_AUTOTEST_EXPORT QSoundEffect : public QObject
+class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
@@ -118,8 +117,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QSoundEffect))
-
 QT_END_HEADER
 
 
diff --git a/src/multimedia/qml/qsoundeffect_pulse_p.cpp b/src/multimedia/effects/qsoundeffect_pulse_p.cpp
index 7e9a25c9ea..7e9a25c9ea 100644
--- a/src/multimedia/qml/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/effects/qsoundeffect_pulse_p.cpp
diff --git a/src/multimedia/qml/qsoundeffect_pulse_p.h b/src/multimedia/effects/qsoundeffect_pulse_p.h
index 247f8a3e3f..247f8a3e3f 100644
--- a/src/multimedia/qml/qsoundeffect_pulse_p.h
+++ b/src/multimedia/effects/qsoundeffect_pulse_p.h
diff --git a/src/multimedia/qml/qsoundeffect_qmedia_p.cpp b/src/multimedia/effects/qsoundeffect_qmedia_p.cpp
index 48fb257605..48fb257605 100644
--- a/src/multimedia/qml/qsoundeffect_qmedia_p.cpp
+++ b/src/multimedia/effects/qsoundeffect_qmedia_p.cpp
diff --git a/src/multimedia/qml/qsoundeffect_qmedia_p.h b/src/multimedia/effects/qsoundeffect_qmedia_p.h
index 8267f797a4..8267f797a4 100644
--- a/src/multimedia/qml/qsoundeffect_qmedia_p.h
+++ b/src/multimedia/effects/qsoundeffect_qmedia_p.h
diff --git a/src/multimedia/qml/qsoundeffect_qsound_p.cpp b/src/multimedia/effects/qsoundeffect_qsound_p.cpp
index df160a9d4e..df160a9d4e 100644
--- a/src/multimedia/qml/qsoundeffect_qsound_p.cpp
+++ b/src/multimedia/effects/qsoundeffect_qsound_p.cpp
diff --git a/src/multimedia/qml/qsoundeffect_qsound_p.h b/src/multimedia/effects/qsoundeffect_qsound_p.h
index 45c08884a4..45c08884a4 100644
--- a/src/multimedia/qml/qsoundeffect_qsound_p.h
+++ b/src/multimedia/effects/qsoundeffect_qsound_p.h
diff --git a/src/multimedia/qml/wavedecoder_p.cpp b/src/multimedia/effects/wavedecoder_p.cpp
index f2277aea0f..f2277aea0f 100644
--- a/src/multimedia/qml/wavedecoder_p.cpp
+++ b/src/multimedia/effects/wavedecoder_p.cpp
diff --git a/src/multimedia/qml/wavedecoder_p.h b/src/multimedia/effects/wavedecoder_p.h
index 00aa14ed98..00aa14ed98 100644
--- a/src/multimedia/qml/wavedecoder_p.h
+++ b/src/multimedia/effects/wavedecoder_p.h
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 106d3ab13e..500aff71ce 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -12,6 +12,6 @@ include(audio/audio.pri)
 include(video/video.pri)
 include(base/base.pri)
 include(playback/playback.pri)
-include(qml/qml.pri)
+include(effects/effects.pri)
 
 symbian: TARGET.UID3 = 0x2001E627
diff --git a/src/multimedia/qml/multimediadeclarative.cpp b/src/multimedia/qml/multimediadeclarative.cpp
deleted file mode 100644
index 7f5298f9c5..0000000000
--- a/src/multimedia/qml/multimediadeclarative.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtMultimedia/multimediadeclarative.h>
-#include <QtMultimedia/private/qsoundeffect_p.h>
-#include <QtMultimedia/private/qdeclarativeaudio_p.h>
-#include <QtMultimedia/private/qdeclarativevideo_p.h>
-
-
-QT_BEGIN_NAMESPACE
-
-namespace QtMultimedia
-{
-
-/*!
-    Register the Multimedia QML elements.
-    \internal
-*/
-
-void qRegisterDeclarativeElements(const char *uri)
-{
-    Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimedia"));
-
-    qmlRegisterType<QSoundEffect>(uri, 4, 7, "SoundEffect");
-    qmlRegisterType<QDeclarativeAudio>(uri, 4, 7, "Audio");
-    qmlRegisterType<QDeclarativeVideo>(uri, 4, 7, "Video");
-}
-
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/multimedia/qml/multimediadeclarative.h b/src/multimedia/qml/multimediadeclarative.h
deleted file mode 100644
index 29af65ade0..0000000000
--- a/src/multimedia/qml/multimediadeclarative.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtMultimedia module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTMULTIMEDIA_QML_H
-#define QTMULTIMEDIA_QML_H
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Multimedia)
-
-namespace QtMultimedia
-{
-extern void Q_MULTIMEDIA_EXPORT qRegisterDeclarativeElements(const char *uri);
-}
-
-QT_END_NAMESPACE
-QT_END_HEADER
-
-#endif  // ifndef QTMULTIMEDIA_QML_H
diff --git a/src/multimedia/qml/qml.pri b/src/multimedia/qml/qml.pri
deleted file mode 100644
index d0ff71d8f4..0000000000
--- a/src/multimedia/qml/qml.pri
+++ /dev/null
@@ -1,37 +0,0 @@
-
-contains(QT_CONFIG, declarative) {
-    QT += declarative
-
-    system(pkg-config --exists \'libpulse >= 0.9.10\') {
-        DEFINES += QT_MULTIMEDIA_PULSEAUDIO
-        HEADERS += $$PWD/qsoundeffect_pulse_p.h
-        SOURCES += $$PWD/qsoundeffect_pulse_p.cpp
-        LIBS += -lpulse
-    } else:x11 {
-        DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
-        HEADERS += $$PWD/qsoundeffect_qmedia_p.h
-        SOURCES += $$PWD/qsoundeffect_qmedia_p.cpp
-    } else {
-        HEADERS += $$PWD/qsoundeffect_qsound_p.h
-        SOURCES += $$PWD/qsoundeffect_qsound_p.cpp
-    }
-
-    HEADERS += \
-        $$PWD/multimediadeclarative.h \
-        $$PWD/qmetadatacontrolmetaobject_p.h \
-        $$PWD/qdeclarativeaudio_p.h \
-        $$PWD/qdeclarativevideo_p.h \
-        $$PWD/qdeclarativemediabase_p.h \
-        $$PWD/qsoundeffect_p.h \
-        $$PWD/wavedecoder_p.h
-
-    SOURCES += \
-        $$PWD/multimediadeclarative.cpp \
-        $$PWD/qmetadatacontrolmetaobject.cpp \
-        $$PWD/qdeclarativeaudio.cpp \
-        $$PWD/qdeclarativevideo.cpp \
-        $$PWD/qdeclarativemediabase.cpp \
-        $$PWD/qsoundeffect.cpp \
-        $$PWD/wavedecoder_p.cpp
-}
-
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp b/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp
index 863b6d4331..d52aa750a9 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp
+++ b/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp
@@ -50,7 +50,7 @@ static int wuchi = qRegisterMetaType<QGstreamerMessage>();
 
 
 /*!
-    \class gstreamer::QGstreamerMessage
+    \class QGstreamerMessage
     \internal
 */
 
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm
index b04667233f..59d01a2673 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm
+++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playermetadata.mm
@@ -251,6 +251,7 @@ void QT7PlayerMetaDataControl::updateTags()
             readFormattedData(metaDataRef, kQTMetaDataStorageFormatiTunes, metaMap);
         }
 #else
+        AutoReleasePool pool;
         NSString *name = [movie attributeForKey:@"QTMovieDisplayNameAttribute"];
         metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String]));
 #endif // QUICKTIME_C_API_AVAILABLE
diff --git a/src/multimedia/qml/qdeclarativeaudio.cpp b/src/plugins/qdeclarativemodules/multimedia/qdeclarativeaudio.cpp
index 1cbf594761..df2888c00d 100644
--- a/src/multimedia/qml/qdeclarativeaudio.cpp
+++ b/src/plugins/qdeclarativemodules/multimedia/qdeclarativeaudio.cpp
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/qml/qdeclarativeaudio_p.h b/src/plugins/qdeclarativemodules/multimedia/qdeclarativeaudio_p.h
index d1fb275521..9881dbce17 100644
--- a/src/multimedia/qml/qdeclarativeaudio_p.h
+++ b/src/plugins/qdeclarativemodules/multimedia/qdeclarativeaudio_p.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtMultimedia/private/qdeclarativemediabase_p.h>
+#include "qdeclarativemediabase_p.h"
 
 #include <QtCore/qbasictimer.h>
 #include <QtDeclarative/qdeclarativeitem.h>
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 
 class QTimerEvent;
 
-class Q_AUTOTEST_EXPORT QDeclarativeAudio : public QObject, public QDeclarativeMediaBase, public QDeclarativeParserStatus
+class QDeclarativeAudio : public QObject, public QDeclarativeMediaBase, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
diff --git a/src/multimedia/qml/qdeclarativemediabase.cpp b/src/plugins/qdeclarativemodules/multimedia/qdeclarativemediabase.cpp
index e054cb2aed..8e87e448b1 100644
--- a/src/multimedia/qml/qdeclarativemediabase.cpp
+++ b/src/plugins/qdeclarativemodules/multimedia/qdeclarativemediabase.cpp
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "QtMultimedia/private/qdeclarativemediabase_p.h"
+#include "qdeclarativemediabase_p.h"
 
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qurl.h>
@@ -48,7 +48,7 @@
 #include <QtMultimedia/qmediaservice.h>
 #include <QtMultimedia/qmediaserviceprovider.h>
 #include <QtMultimedia/qmetadatacontrol.h>
-#include <QtMultimedia/private/qmetadatacontrolmetaobject_p.h>
+#include "qmetadatacontrolmetaobject_p.h"
 
 
 
diff --git a/src/multimedia/qml/qdeclarativemediabase_p.h b/src/plugins/qdeclarativemodules/multimedia/qdeclarativemediabase_p.h
index 2fc48db630..b40e84e6c4 100644
--- a/src/multimedia/qml/qdeclarativemediabase_p.h
+++ b/src/plugins/qdeclarativemodules/multimedia/qdeclarativemediabase_p.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -67,7 +67,7 @@ class QMetaDataControl;
 class QMetaDataControlMetaObject;
 class QDeclarativeMediaBaseAnimation;
 
-class Q_AUTOTEST_EXPORT QDeclarativeMediaBase
+class QDeclarativeMediaBase
 {
 public:
     QDeclarativeMediaBase();
diff --git a/src/multimedia/qml/qdeclarativevideo.cpp b/src/plugins/qdeclarativemodules/multimedia/qdeclarativevideo.cpp
index 7f6207555c..064f242177 100644
--- a/src/multimedia/qml/qdeclarativevideo.cpp
+++ b/src/plugins/qdeclarativemodules/multimedia/qdeclarativevideo.cpp
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/multimedia/qml/qdeclarativevideo_p.h b/src/plugins/qdeclarativemodules/multimedia/qdeclarativevideo_p.h
index d5ebde1a7f..fb13519cfa 100644
--- a/src/multimedia/qml/qdeclarativevideo_p.h
+++ b/src/plugins/qdeclarativemodules/multimedia/qdeclarativevideo_p.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtMultimedia/private/qdeclarativemediabase_p.h>
+#include "qdeclarativemediabase_p.h"
 
 #include <QtMultimedia/qgraphicsvideoitem.h>
 
@@ -69,7 +69,7 @@ class QTimerEvent;
 class QVideoSurfaceFormat;
 
 
-class Q_AUTOTEST_EXPORT QDeclarativeVideo : public QDeclarativeItem, public QDeclarativeMediaBase
+class QDeclarativeVideo : public QDeclarativeItem, public QDeclarativeMediaBase
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
diff --git a/src/multimedia/qml/qmetadatacontrolmetaobject.cpp b/src/plugins/qdeclarativemodules/multimedia/qmetadatacontrolmetaobject.cpp
index 47b6382f05..e90cbd6021 100644
--- a/src/multimedia/qml/qmetadatacontrolmetaobject.cpp
+++ b/src/plugins/qdeclarativemodules/multimedia/qmetadatacontrolmetaobject.cpp
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtMultimedia/private/qmetadatacontrolmetaobject_p.h>
+#include "qmetadatacontrolmetaobject_p.h"
 #include <QtMultimedia/qmetadatacontrol.h>
 
 
diff --git a/src/multimedia/qml/qmetadatacontrolmetaobject_p.h b/src/plugins/qdeclarativemodules/multimedia/qmetadatacontrolmetaobject_p.h
index ec4df05018..c381f2dcec 100644
--- a/src/multimedia/qml/qmetadatacontrolmetaobject_p.h
+++ b/src/plugins/qdeclarativemodules/multimedia/qmetadatacontrolmetaobject_p.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtMultimedia module of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/src.pro b/src/src.pro
index 7bb731e63e..8c21ef7363 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -121,8 +121,6 @@ src_declarative.target = sub-declarative
       src_phonon.depends +=  src_dbus
    }
    contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): src_plugins.depends += src_opengl
-   contains(QT_CONFIG, declarative): src_multimedia.depends += src_declarative
-   contains(QT_CONFIG, multimedia): src_imports += src_multimedia
 }
 
 !symbian {
diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
index 13bf606e0f..bfc222322d 100644
--- a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
+++ b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
@@ -1,4 +1,14 @@
 load(qttest_p4)
-SOURCES += tst_qdeclarativeaudio.cpp
+
+HEADERS += \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativeaudio_p.h \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativemediabase_p.h \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qmetadatacontrolmetaobject_p.h
+
+SOURCES += \
+        tst_qdeclarativeaudio.cpp \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativeaudio.cpp \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativemediabase.cpp \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qmetadatacontrolmetaobject.cpp
 
 QT += multimedia declarative
diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
index 11439ceeb8..55c7135e9c 100644
--- a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
+++ b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
@@ -41,7 +41,7 @@
 
 #include <QtTest/QtTest>
 
-#include <QtMultimedia/private/qdeclarativeaudio_p.h>
+#include "../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativeaudio_p.h"
 
 #include <QtGui/qapplication.h>
 #include <QtMultimedia/qmediaplayercontrol.h>
diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
index d946bb049d..497ee0eeb2 100644
--- a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
+++ b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
@@ -1,4 +1,14 @@
 load(qttest_p4)
-SOURCES += tst_qdeclarativevideo.cpp
+
+HEADERS += \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativevideo_p.h \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativemediabase_p.h \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qmetadatacontrolmetaobject_p.h
+
+SOURCES += \
+        tst_qdeclarativevideo.cpp \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativevideo.cpp \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativemediabase.cpp \
+        $$PWD/../../../src/plugins/qdeclarativemodules/multimedia/qmetadatacontrolmetaobject.cpp
 
 QT += multimedia declarative
diff --git a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
index 9fc1e70255..d3bfc38abf 100644
--- a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
+++ b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
@@ -41,7 +41,7 @@
 
 #include <QtTest/QtTest>
 
-#include <QtMultimedia/private/qdeclarativevideo_p.h>
+#include "../../../src/plugins/qdeclarativemodules/multimedia/qdeclarativevideo_p.h"
 
 #include <QtGui/qapplication.h>
 #include <QtMultimedia/qabstractvideosurface.h>