summaryrefslogtreecommitdiffstats
path: root/src/multimediakit/audio
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimediakit/audio')
-rw-r--r--src/multimediakit/audio/qaudio.cpp2
-rw-r--r--src/multimediakit/audio/qaudio.h4
-rw-r--r--src/multimediakit/audio/qaudio_mac.cpp2
-rw-r--r--src/multimediakit/audio/qaudio_mac_p.h2
-rw-r--r--src/multimediakit/audio/qaudiodevicefactory.cpp2
-rw-r--r--src/multimediakit/audio/qaudiodevicefactory_p.h4
-rw-r--r--src/multimediakit/audio/qaudiodeviceinfo.cpp4
-rw-r--r--src/multimediakit/audio/qaudiodeviceinfo.h4
-rw-r--r--src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp2
-rw-r--r--src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h2
-rw-r--r--src/multimediakit/audio/qaudiodeviceinfo_mac_p.cpp2
-rw-r--r--src/multimediakit/audio/qaudiodeviceinfo_mac_p.h2
-rw-r--r--src/multimediakit/audio/qaudiodeviceinfo_win32_p.cpp2
-rw-r--r--src/multimediakit/audio/qaudiodeviceinfo_win32_p.h2
-rw-r--r--src/multimediakit/audio/qaudioformat.cpp2
-rw-r--r--src/multimediakit/audio/qaudioformat.h4
-rw-r--r--src/multimediakit/audio/qaudioinput.cpp2
-rw-r--r--src/multimediakit/audio/qaudioinput.h4
-rw-r--r--src/multimediakit/audio/qaudioinput_alsa_p.cpp2
-rw-r--r--src/multimediakit/audio/qaudioinput_alsa_p.h2
-rw-r--r--src/multimediakit/audio/qaudioinput_mac_p.cpp2
-rw-r--r--src/multimediakit/audio/qaudioinput_mac_p.h2
-rw-r--r--src/multimediakit/audio/qaudioinput_win32_p.cpp2
-rw-r--r--src/multimediakit/audio/qaudioinput_win32_p.h2
-rw-r--r--src/multimediakit/audio/qaudiooutput.cpp2
-rw-r--r--src/multimediakit/audio/qaudiooutput.h4
-rw-r--r--src/multimediakit/audio/qaudiooutput_alsa_p.cpp2
-rw-r--r--src/multimediakit/audio/qaudiooutput_alsa_p.h2
-rw-r--r--src/multimediakit/audio/qaudiooutput_mac_p.cpp2
-rw-r--r--src/multimediakit/audio/qaudiooutput_mac_p.h2
-rw-r--r--src/multimediakit/audio/qaudiooutput_win32_p.cpp2
-rw-r--r--src/multimediakit/audio/qaudiooutput_win32_p.h2
-rw-r--r--src/multimediakit/audio/qaudiopluginloader.cpp2
-rw-r--r--src/multimediakit/audio/qaudiopluginloader_p.h4
-rw-r--r--src/multimediakit/audio/qaudiosystem.cpp2
-rw-r--r--src/multimediakit/audio/qaudiosystem.h4
-rw-r--r--src/multimediakit/audio/qaudiosystemplugin.cpp2
-rw-r--r--src/multimediakit/audio/qaudiosystemplugin.h4
38 files changed, 47 insertions, 49 deletions
diff --git a/src/multimediakit/audio/qaudio.cpp b/src/multimediakit/audio/qaudio.cpp
index e823283f3..cc422cedd 100644
--- a/src/multimediakit/audio/qaudio.cpp
+++ b/src/multimediakit/audio/qaudio.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudio.h b/src/multimediakit/audio/qaudio.h
index b8b585b69..b420d878c 100644
--- a/src/multimediakit/audio/qaudio.h
+++ b/src/multimediakit/audio/qaudio.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -43,7 +43,7 @@
#ifndef QAUDIO_H
#define QAUDIO_H
-#include <qmobilityglobal.h>
+#include <qtmultimediakitdefs.h>
#include <qtmedianamespace.h>
#include <QtCore/qmetatype.h>
diff --git a/src/multimediakit/audio/qaudio_mac.cpp b/src/multimediakit/audio/qaudio_mac.cpp
index a13b54c39..461508304 100644
--- a/src/multimediakit/audio/qaudio_mac.cpp
+++ b/src/multimediakit/audio/qaudio_mac.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudio_mac_p.h b/src/multimediakit/audio/qaudio_mac_p.h
index bbd63e485..4acff79d0 100644
--- a/src/multimediakit/audio/qaudio_mac_p.h
+++ b/src/multimediakit/audio/qaudio_mac_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiodevicefactory.cpp b/src/multimediakit/audio/qaudiodevicefactory.cpp
index 6d249b250..19071e78f 100644
--- a/src/multimediakit/audio/qaudiodevicefactory.cpp
+++ b/src/multimediakit/audio/qaudiodevicefactory.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiodevicefactory_p.h b/src/multimediakit/audio/qaudiodevicefactory_p.h
index e162e04d6..74104bb73 100644
--- a/src/multimediakit/audio/qaudiodevicefactory_p.h
+++ b/src/multimediakit/audio/qaudiodevicefactory_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -56,7 +56,7 @@
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
-#include <qmobilityglobal.h>
+#include <qtmultimediakitdefs.h>
#include <qtmedianamespace.h>
#include "qaudiodeviceinfo.h"
diff --git a/src/multimediakit/audio/qaudiodeviceinfo.cpp b/src/multimediakit/audio/qaudiodeviceinfo.cpp
index 44cc8fe79..4b71b273b 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo.cpp
+++ b/src/multimediakit/audio/qaudiodeviceinfo.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -96,8 +96,6 @@ public:
\inmodule QtMultimediaKit
\ingroup multimedia
- \since QtMobility 1.0
-
QAudioDeviceInfo lets you query for audio devices--such as sound
cards and USB headsets--that are currently available on the system.
The audio devices available are dependent on the platform or audio plugins installed.
diff --git a/src/multimediakit/audio/qaudiodeviceinfo.h b/src/multimediakit/audio/qaudiodeviceinfo.h
index 547093238..703447910 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo.h
+++ b/src/multimediakit/audio/qaudiodeviceinfo.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -49,7 +49,7 @@
#include <QtCore/qstringlist.h>
#include <QtCore/qlist.h>
-#include <qmobilityglobal.h>
+#include <qtmultimediakitdefs.h>
#include <qtmedianamespace.h>
#include <qaudio.h>
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp
index 25e5889bd..113b330d4 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp
+++ b/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h b/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h
index 02a633bea..5afc8f8c4 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h
+++ b/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_mac_p.cpp b/src/multimediakit/audio/qaudiodeviceinfo_mac_p.cpp
index ee6660c6e..4c7779f91 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_mac_p.cpp
+++ b/src/multimediakit/audio/qaudiodeviceinfo_mac_p.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_mac_p.h b/src/multimediakit/audio/qaudiodeviceinfo_mac_p.h
index 5cd5deae3..099d7fd61 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_mac_p.h
+++ b/src/multimediakit/audio/qaudiodeviceinfo_mac_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimediakit/audio/qaudiodeviceinfo_win32_p.cpp
index c275a1b61..10b9b777d 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimediakit/audio/qaudiodeviceinfo_win32_p.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiodeviceinfo_win32_p.h b/src/multimediakit/audio/qaudiodeviceinfo_win32_p.h
index 78f3d7fad..9ed3b66d5 100644
--- a/src/multimediakit/audio/qaudiodeviceinfo_win32_p.h
+++ b/src/multimediakit/audio/qaudiodeviceinfo_win32_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudioformat.cpp b/src/multimediakit/audio/qaudioformat.cpp
index 3afba7ee4..833928f8c 100644
--- a/src/multimediakit/audio/qaudioformat.cpp
+++ b/src/multimediakit/audio/qaudioformat.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudioformat.h b/src/multimediakit/audio/qaudioformat.h
index b7d0a4027..ebee33a7b 100644
--- a/src/multimediakit/audio/qaudioformat.h
+++ b/src/multimediakit/audio/qaudioformat.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -46,7 +46,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qshareddata.h>
-#include <qmobilityglobal.h>
+#include <qtmultimediakitdefs.h>
#include <qtmedianamespace.h>
QT_BEGIN_HEADER
diff --git a/src/multimediakit/audio/qaudioinput.cpp b/src/multimediakit/audio/qaudioinput.cpp
index 17f120318..bb4f89653 100644
--- a/src/multimediakit/audio/qaudioinput.cpp
+++ b/src/multimediakit/audio/qaudioinput.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudioinput.h b/src/multimediakit/audio/qaudioinput.h
index c1b866eb6..13d3cb015 100644
--- a/src/multimediakit/audio/qaudioinput.h
+++ b/src/multimediakit/audio/qaudioinput.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -45,7 +45,7 @@
#include <QtCore/qiodevice.h>
-#include <qmobilityglobal.h>
+#include <qtmultimediakitdefs.h>
#include <qtmedianamespace.h>
#include <qaudio.h>
diff --git a/src/multimediakit/audio/qaudioinput_alsa_p.cpp b/src/multimediakit/audio/qaudioinput_alsa_p.cpp
index e7a04599f..044458cd0 100644
--- a/src/multimediakit/audio/qaudioinput_alsa_p.cpp
+++ b/src/multimediakit/audio/qaudioinput_alsa_p.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudioinput_alsa_p.h b/src/multimediakit/audio/qaudioinput_alsa_p.h
index a6f371642..2a5b3df1a 100644
--- a/src/multimediakit/audio/qaudioinput_alsa_p.h
+++ b/src/multimediakit/audio/qaudioinput_alsa_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudioinput_mac_p.cpp b/src/multimediakit/audio/qaudioinput_mac_p.cpp
index 8c3bbe600..5a4053220 100644
--- a/src/multimediakit/audio/qaudioinput_mac_p.cpp
+++ b/src/multimediakit/audio/qaudioinput_mac_p.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudioinput_mac_p.h b/src/multimediakit/audio/qaudioinput_mac_p.h
index 61b6edf75..cc0e62b11 100644
--- a/src/multimediakit/audio/qaudioinput_mac_p.h
+++ b/src/multimediakit/audio/qaudioinput_mac_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudioinput_win32_p.cpp b/src/multimediakit/audio/qaudioinput_win32_p.cpp
index 4802f41d2..718656ba3 100644
--- a/src/multimediakit/audio/qaudioinput_win32_p.cpp
+++ b/src/multimediakit/audio/qaudioinput_win32_p.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudioinput_win32_p.h b/src/multimediakit/audio/qaudioinput_win32_p.h
index e1972cd66..0fc1ae8a6 100644
--- a/src/multimediakit/audio/qaudioinput_win32_p.h
+++ b/src/multimediakit/audio/qaudioinput_win32_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiooutput.cpp b/src/multimediakit/audio/qaudiooutput.cpp
index afde7ff14..10496bd98 100644
--- a/src/multimediakit/audio/qaudiooutput.cpp
+++ b/src/multimediakit/audio/qaudiooutput.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiooutput.h b/src/multimediakit/audio/qaudiooutput.h
index 68b0eb2d6..bc7fa62db 100644
--- a/src/multimediakit/audio/qaudiooutput.h
+++ b/src/multimediakit/audio/qaudiooutput.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -45,7 +45,7 @@
#include <QtCore/qiodevice.h>
-#include <qmobilityglobal.h>
+#include <qtmultimediakitdefs.h>
#include <qtmedianamespace.h>
#include <qaudio.h>
diff --git a/src/multimediakit/audio/qaudiooutput_alsa_p.cpp b/src/multimediakit/audio/qaudiooutput_alsa_p.cpp
index 3a0c7e344..8ef4e2819 100644
--- a/src/multimediakit/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimediakit/audio/qaudiooutput_alsa_p.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiooutput_alsa_p.h b/src/multimediakit/audio/qaudiooutput_alsa_p.h
index 51f3fee5e..953dc7ae7 100644
--- a/src/multimediakit/audio/qaudiooutput_alsa_p.h
+++ b/src/multimediakit/audio/qaudiooutput_alsa_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiooutput_mac_p.cpp b/src/multimediakit/audio/qaudiooutput_mac_p.cpp
index 17d3d1ff8..cace401d6 100644
--- a/src/multimediakit/audio/qaudiooutput_mac_p.cpp
+++ b/src/multimediakit/audio/qaudiooutput_mac_p.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiooutput_mac_p.h b/src/multimediakit/audio/qaudiooutput_mac_p.h
index 5524621f9..8e7a11919 100644
--- a/src/multimediakit/audio/qaudiooutput_mac_p.h
+++ b/src/multimediakit/audio/qaudiooutput_mac_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiooutput_win32_p.cpp b/src/multimediakit/audio/qaudiooutput_win32_p.cpp
index 3f465de37..d5b31a30f 100644
--- a/src/multimediakit/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimediakit/audio/qaudiooutput_win32_p.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiooutput_win32_p.h b/src/multimediakit/audio/qaudiooutput_win32_p.h
index 53cfe71f7..6ca6fc562 100644
--- a/src/multimediakit/audio/qaudiooutput_win32_p.h
+++ b/src/multimediakit/audio/qaudiooutput_win32_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiopluginloader.cpp b/src/multimediakit/audio/qaudiopluginloader.cpp
index 72cfb1804..2807fcf9d 100644
--- a/src/multimediakit/audio/qaudiopluginloader.cpp
+++ b/src/multimediakit/audio/qaudiopluginloader.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiopluginloader_p.h b/src/multimediakit/audio/qaudiopluginloader_p.h
index 6d5fef313..89d9679d8 100644
--- a/src/multimediakit/audio/qaudiopluginloader_p.h
+++ b/src/multimediakit/audio/qaudiopluginloader_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -53,7 +53,7 @@
// We mean it.
//
-#include <qmobilityglobal.h>
+#include <qtmultimediakitdefs.h>
#include <QObject>
#include <QtCore/qstring.h>
#include <QtCore/qmap.h>
diff --git a/src/multimediakit/audio/qaudiosystem.cpp b/src/multimediakit/audio/qaudiosystem.cpp
index 5b2b0c3be..4555be978 100644
--- a/src/multimediakit/audio/qaudiosystem.cpp
+++ b/src/multimediakit/audio/qaudiosystem.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiosystem.h b/src/multimediakit/audio/qaudiosystem.h
index f2875a5cd..6773343ad 100644
--- a/src/multimediakit/audio/qaudiosystem.h
+++ b/src/multimediakit/audio/qaudiosystem.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -42,7 +42,7 @@
#ifndef QAUDIOSYSTEM_H
#define QAUDIOSYSTEM_H
-#include <qmobilityglobal.h>
+#include <qtmultimediakitdefs.h>
#include <qtmedianamespace.h>
#include "qaudio.h"
diff --git a/src/multimediakit/audio/qaudiosystemplugin.cpp b/src/multimediakit/audio/qaudiosystemplugin.cpp
index 3744b6f88..3347a6d44 100644
--- a/src/multimediakit/audio/qaudiosystemplugin.cpp
+++ b/src/multimediakit/audio/qaudiosystemplugin.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/multimediakit/audio/qaudiosystemplugin.h b/src/multimediakit/audio/qaudiosystemplugin.h
index 740e1e427..13e642fde 100644
--- a/src/multimediakit/audio/qaudiosystemplugin.h
+++ b/src/multimediakit/audio/qaudiosystemplugin.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Mobility Components.
+** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -47,7 +47,7 @@
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>
-#include <qmobilityglobal.h>
+#include <qtmultimediakitdefs.h>
#include <qtmedianamespace.h>
#include "qaudioformat.h"