diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-07-18 17:21:00 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-19 08:40:59 +0200 |
| commit | fdac892bbc3454c9679236364d915932cdf4b380 (patch) | |
| tree | 227d2a48083fbdf746dcfe729a7cf7c8634d4880 /src/multimediakit | |
| parent | 07438ca4f0afd9ebe352b48d978909d5baa4666f (diff) | |
Remove most of the "mobility" references.
Docs still need some fixing, but there are some legitimate usages of
it there.
Change-Id: I94c7b68788ce97829711a4384884d7e52fe84162
Reviewed-on: http://codereview.qt.nokia.com/1736
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/multimediakit')
196 files changed, 314 insertions, 462 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" diff --git a/src/multimediakit/effects/qsamplecache_p.cpp b/src/multimediakit/effects/qsamplecache_p.cpp index d86aa2493..da550e8ae 100644 --- a/src/multimediakit/effects/qsamplecache_p.cpp +++ b/src/multimediakit/effects/qsamplecache_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/effects/qsamplecache_p.h b/src/multimediakit/effects/qsamplecache_p.h index 327f3bd8e..fbe246008 100644 --- a/src/multimediakit/effects/qsamplecache_p.h +++ b/src/multimediakit/effects/qsamplecache_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/effects/qsoundeffect.cpp b/src/multimediakit/effects/qsoundeffect.cpp index 9ac1591a1..b3c7706a6 100644 --- a/src/multimediakit/effects/qsoundeffect.cpp +++ b/src/multimediakit/effects/qsoundeffect.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/effects/qsoundeffect_p.h b/src/multimediakit/effects/qsoundeffect_p.h index 7f6b24a00..de8de12a3 100644 --- a/src/multimediakit/effects/qsoundeffect_p.h +++ b/src/multimediakit/effects/qsoundeffect_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 <QtCore/qobject.h> #include <QtCore/qurl.h> #include <QtCore/qstringlist.h> diff --git a/src/multimediakit/effects/qsoundeffect_pulse_p.cpp b/src/multimediakit/effects/qsoundeffect_pulse_p.cpp index cb86b8bf3..f65fd9995 100644 --- a/src/multimediakit/effects/qsoundeffect_pulse_p.cpp +++ b/src/multimediakit/effects/qsoundeffect_pulse_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/effects/qsoundeffect_pulse_p.h b/src/multimediakit/effects/qsoundeffect_pulse_p.h index d07e9b184..6653f0533 100644 --- a/src/multimediakit/effects/qsoundeffect_pulse_p.h +++ b/src/multimediakit/effects/qsoundeffect_pulse_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/effects/qsoundeffect_qmedia_p.cpp b/src/multimediakit/effects/qsoundeffect_qmedia_p.cpp index 242997191..dfd56b09c 100644 --- a/src/multimediakit/effects/qsoundeffect_qmedia_p.cpp +++ b/src/multimediakit/effects/qsoundeffect_qmedia_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/effects/qsoundeffect_qmedia_p.h b/src/multimediakit/effects/qsoundeffect_qmedia_p.h index 7351350e6..9e5dd25db 100644 --- a/src/multimediakit/effects/qsoundeffect_qmedia_p.h +++ b/src/multimediakit/effects/qsoundeffect_qmedia_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/effects/qsoundeffect_qsound_p.cpp b/src/multimediakit/effects/qsoundeffect_qsound_p.cpp index 7a753d18c..1706af9f1 100644 --- a/src/multimediakit/effects/qsoundeffect_qsound_p.cpp +++ b/src/multimediakit/effects/qsoundeffect_qsound_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/effects/qsoundeffect_qsound_p.h b/src/multimediakit/effects/qsoundeffect_qsound_p.h index 2a7691b23..085a97ea2 100644 --- a/src/multimediakit/effects/qsoundeffect_qsound_p.h +++ b/src/multimediakit/effects/qsoundeffect_qsound_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/effects/qwavedecoder_p.cpp b/src/multimediakit/effects/qwavedecoder_p.cpp index 992bb0996..19b262adc 100644 --- a/src/multimediakit/effects/qwavedecoder_p.cpp +++ b/src/multimediakit/effects/qwavedecoder_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/effects/qwavedecoder_p.h b/src/multimediakit/effects/qwavedecoder_p.h index 90dfda811..d2e438fe7 100644 --- a/src/multimediakit/effects/qwavedecoder_p.h +++ b/src/multimediakit/effects/qwavedecoder_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/multimediakit.pro b/src/multimediakit/multimediakit.pro index 7c3b6cde4..7ff2660de 100644 --- a/src/multimediakit/multimediakit.pro +++ b/src/multimediakit/multimediakit.pro @@ -75,7 +75,8 @@ PUBLIC_HEADERS += \ qvideorenderercontrol.h \ qmediatimerange.h \ qmedianetworkaccesscontrol.h \ - qmediaenumdebug.h + qmediaenumdebug.h \ + qtmultimediakitdefs.h SOURCES += qmediacontrol.cpp \ qmediaobject.cpp \ diff --git a/src/multimediakit/qaudiocapturesource.cpp b/src/multimediakit/qaudiocapturesource.cpp index 55adda15d..efd6a6245 100644 --- a/src/multimediakit/qaudiocapturesource.cpp +++ b/src/multimediakit/qaudiocapturesource.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/qaudiocapturesource.h b/src/multimediakit/qaudiocapturesource.h index 0ef75552a..7f2200895 100644 --- a/src/multimediakit/qaudiocapturesource.h +++ b/src/multimediakit/qaudiocapturesource.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/qaudioencodercontrol.cpp b/src/multimediakit/qaudioencodercontrol.cpp index d836da94a..4c113d950 100644 --- a/src/multimediakit/qaudioencodercontrol.cpp +++ b/src/multimediakit/qaudioencodercontrol.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/qaudioencodercontrol.h b/src/multimediakit/qaudioencodercontrol.h index 06cff617e..e464bc055 100644 --- a/src/multimediakit/qaudioencodercontrol.h +++ b/src/multimediakit/qaudioencodercontrol.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/qaudioendpointselector.cpp b/src/multimediakit/qaudioendpointselector.cpp index 1a09f3546..9bbe267a3 100644 --- a/src/multimediakit/qaudioendpointselector.cpp +++ b/src/multimediakit/qaudioendpointselector.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/qaudioendpointselector.h b/src/multimediakit/qaudioendpointselector.h index e28010c65..1fc10904c 100644 --- a/src/multimediakit/qaudioendpointselector.h +++ b/src/multimediakit/qaudioendpointselector.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/qcamera.cpp b/src/multimediakit/qcamera.cpp index 94b7ac0a2..d7fb532db 100644 --- a/src/multimediakit/qcamera.cpp +++ b/src/multimediakit/qcamera.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/qcamera.h b/src/multimediakit/qcamera.h index b6fd163a5..268e09e6a 100644 --- a/src/multimediakit/qcamera.h +++ b/src/multimediakit/qcamera.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/qcameracapturebufferformatcontrol.cpp b/src/multimediakit/qcameracapturebufferformatcontrol.cpp index 06602abe8..f80ad9943 100644 --- a/src/multimediakit/qcameracapturebufferformatcontrol.cpp +++ b/src/multimediakit/qcameracapturebufferformatcontrol.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 @@ -57,7 +57,6 @@ QT_BEGIN_NAMESPACE defined in QCameraCaptureBufferFormatControl_iid. \sa QMediaService::requestControl() - \since QtMobility 1.2 */ /*! diff --git a/src/multimediakit/qcameracapturebufferformatcontrol.h b/src/multimediakit/qcameracapturebufferformatcontrol.h index 27835b35f..cf296e60e 100644 --- a/src/multimediakit/qcameracapturebufferformatcontrol.h +++ b/src/multimediakit/qcameracapturebufferformatcontrol.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/qcameracapturedestinationcontrol.cpp b/src/multimediakit/qcameracapturedestinationcontrol.cpp index 3899d8d8c..1fcbd256b 100644 --- a/src/multimediakit/qcameracapturedestinationcontrol.cpp +++ b/src/multimediakit/qcameracapturedestinationcontrol.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 @@ -61,7 +61,6 @@ QT_BEGIN_NAMESPACE \sa QMediaService::requestControl() - \since QtMobility 1.2 */ /*! diff --git a/src/multimediakit/qcameracapturedestinationcontrol.h b/src/multimediakit/qcameracapturedestinationcontrol.h index f53fad5e6..7dcae365f 100644 --- a/src/multimediakit/qcameracapturedestinationcontrol.h +++ b/src/multimediakit/qcameracapturedestinationcontrol.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/qcameracontrol.cpp b/src/multimediakit/qcameracontrol.cpp index fdeb1d29a..4bf236784 100644 --- a/src/multimediakit/qcameracontrol.cpp +++ b/src/multimediakit/qcameracontrol.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/qcameracontrol.h b/src/multimediakit/qcameracontrol.h index a1830a5a3..e64f77a64 100644 --- a/src/multimediakit/qcameracontrol.h +++ b/src/multimediakit/qcameracontrol.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/qcameraexposure.cpp b/src/multimediakit/qcameraexposure.cpp index 73266b5c1..e748560aa 100644 --- a/src/multimediakit/qcameraexposure.cpp +++ b/src/multimediakit/qcameraexposure.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/qcameraexposure.h b/src/multimediakit/qcameraexposure.h index 6da69afa2..590f73402 100644 --- a/src/multimediakit/qcameraexposure.h +++ b/src/multimediakit/qcameraexposure.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/qcameraexposurecontrol.cpp b/src/multimediakit/qcameraexposurecontrol.cpp index 5df107e75..832ab081a 100644 --- a/src/multimediakit/qcameraexposurecontrol.cpp +++ b/src/multimediakit/qcameraexposurecontrol.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/qcameraexposurecontrol.h b/src/multimediakit/qcameraexposurecontrol.h index 5d8a59c67..b764a9112 100644 --- a/src/multimediakit/qcameraexposurecontrol.h +++ b/src/multimediakit/qcameraexposurecontrol.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/qcameraflashcontrol.cpp b/src/multimediakit/qcameraflashcontrol.cpp index 000cd28af..1633a6481 100644 --- a/src/multimediakit/qcameraflashcontrol.cpp +++ b/src/multimediakit/qcameraflashcontrol.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/qcameraflashcontrol.h b/src/multimediakit/qcameraflashcontrol.h index 8f203ae89..d2b393990 100644 --- a/src/multimediakit/qcameraflashcontrol.h +++ b/src/multimediakit/qcameraflashcontrol.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/qcamerafocus.cpp b/src/multimediakit/qcamerafocus.cpp index ccb157c0e..8db33ff29 100644 --- a/src/multimediakit/qcamerafocus.cpp +++ b/src/multimediakit/qcamerafocus.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/qcamerafocus.h b/src/multimediakit/qcamerafocus.h index dcc8111e1..78ca75406 100644 --- a/src/multimediakit/qcamerafocus.h +++ b/src/multimediakit/qcamerafocus.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/qcamerafocuscontrol.cpp b/src/multimediakit/qcamerafocuscontrol.cpp index 1a30a9c21..3a7386e3b 100644 --- a/src/multimediakit/qcamerafocuscontrol.cpp +++ b/src/multimediakit/qcamerafocuscontrol.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/qcamerafocuscontrol.h b/src/multimediakit/qcamerafocuscontrol.h index 23b930115..7962435a3 100644 --- a/src/multimediakit/qcamerafocuscontrol.h +++ b/src/multimediakit/qcamerafocuscontrol.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/qcameraimagecapture.cpp b/src/multimediakit/qcameraimagecapture.cpp index 5fad8313a..145eb0991 100644 --- a/src/multimediakit/qcameraimagecapture.cpp +++ b/src/multimediakit/qcameraimagecapture.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/qcameraimagecapture.h b/src/multimediakit/qcameraimagecapture.h index 09d4d67b4..0b4601ef1 100644 --- a/src/multimediakit/qcameraimagecapture.h +++ b/src/multimediakit/qcameraimagecapture.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/qcameraimagecapturecontrol.cpp b/src/multimediakit/qcameraimagecapturecontrol.cpp index 9733cfb61..9e19b14b4 100644 --- a/src/multimediakit/qcameraimagecapturecontrol.cpp +++ b/src/multimediakit/qcameraimagecapturecontrol.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/qcameraimagecapturecontrol.h b/src/multimediakit/qcameraimagecapturecontrol.h index a33dd1bf8..6915b5dd2 100644 --- a/src/multimediakit/qcameraimagecapturecontrol.h +++ b/src/multimediakit/qcameraimagecapturecontrol.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/qcameraimageprocessing.cpp b/src/multimediakit/qcameraimageprocessing.cpp index ee19911e5..6ed9bb402 100644 --- a/src/multimediakit/qcameraimageprocessing.cpp +++ b/src/multimediakit/qcameraimageprocessing.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/qcameraimageprocessing.h b/src/multimediakit/qcameraimageprocessing.h index 76c36975d..9ed23d175 100644 --- a/src/multimediakit/qcameraimageprocessing.h +++ b/src/multimediakit/qcameraimageprocessing.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/qcameraimageprocessingcontrol.cpp b/src/multimediakit/qcameraimageprocessingcontrol.cpp index 1b7007180..453c2d575 100644 --- a/src/multimediakit/qcameraimageprocessingcontrol.cpp +++ b/src/multimediakit/qcameraimageprocessingcontrol.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/qcameraimageprocessingcontrol.h b/src/multimediakit/qcameraimageprocessingcontrol.h index 6a1c920e3..db77f09ac 100644 --- a/src/multimediakit/qcameraimageprocessingcontrol.h +++ b/src/multimediakit/qcameraimageprocessingcontrol.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/qcameralockscontrol.cpp b/src/multimediakit/qcameralockscontrol.cpp index f254fdd61..5afab47fa 100644 --- a/src/multimediakit/qcameralockscontrol.cpp +++ b/src/multimediakit/qcameralockscontrol.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/qcameralockscontrol.h b/src/multimediakit/qcameralockscontrol.h index 02da2ef97..0d6e1a224 100644 --- a/src/multimediakit/qcameralockscontrol.h +++ b/src/multimediakit/qcameralockscontrol.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/qcameraviewfinder.cpp b/src/multimediakit/qcameraviewfinder.cpp index 86136163e..c4df95934 100644 --- a/src/multimediakit/qcameraviewfinder.cpp +++ b/src/multimediakit/qcameraviewfinder.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/qcameraviewfinder.h b/src/multimediakit/qcameraviewfinder.h index 6602b0b03..0feee37c1 100644 --- a/src/multimediakit/qcameraviewfinder.h +++ b/src/multimediakit/qcameraviewfinder.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/qeglimagetexturesurface.cpp b/src/multimediakit/qeglimagetexturesurface.cpp index d4b10dcce..685ae031f 100644 --- a/src/multimediakit/qeglimagetexturesurface.cpp +++ b/src/multimediakit/qeglimagetexturesurface.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/qeglimagetexturesurface_p.h b/src/multimediakit/qeglimagetexturesurface_p.h index f193692ce..d8aceb74d 100644 --- a/src/multimediakit/qeglimagetexturesurface_p.h +++ b/src/multimediakit/qeglimagetexturesurface_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 <QtCore/qsize.h> #include <QtGui/qimage.h> #include <QtGui/qmatrix4x4.h> diff --git a/src/multimediakit/qgraphicsvideoitem.cpp b/src/multimediakit/qgraphicsvideoitem.cpp index 00d0f1c59..1f8f6db61 100644 --- a/src/multimediakit/qgraphicsvideoitem.cpp +++ b/src/multimediakit/qgraphicsvideoitem.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/qgraphicsvideoitem.h b/src/multimediakit/qgraphicsvideoitem.h index fd39ab90a..309ec4ddb 100644 --- a/src/multimediakit/qgraphicsvideoitem.h +++ b/src/multimediakit/qgraphicsvideoitem.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/qgraphicsvideoitem_maemo6.cpp b/src/multimediakit/qgraphicsvideoitem_maemo6.cpp index de71daf1b..e0f812ca6 100644 --- a/src/multimediakit/qgraphicsvideoitem_maemo6.cpp +++ b/src/multimediakit/qgraphicsvideoitem_maemo6.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/qimageencodercontrol.cpp b/src/multimediakit/qimageencodercontrol.cpp index 3c05bab88..1e6aab1c1 100644 --- a/src/multimediakit/qimageencodercontrol.cpp +++ b/src/multimediakit/qimageencodercontrol.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/qimageencodercontrol.h b/src/multimediakit/qimageencodercontrol.h index 71bf65729..cebcecb33 100644 --- a/src/multimediakit/qimageencodercontrol.h +++ b/src/multimediakit/qimageencodercontrol.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/qlocalmediaplaylistprovider.cpp b/src/multimediakit/qlocalmediaplaylistprovider.cpp index 1bbb2ff64..84d54ecfd 100644 --- a/src/multimediakit/qlocalmediaplaylistprovider.cpp +++ b/src/multimediakit/qlocalmediaplaylistprovider.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/qlocalmediaplaylistprovider.h b/src/multimediakit/qlocalmediaplaylistprovider.h index 9ce590f25..32b50cfe2 100644 --- a/src/multimediakit/qlocalmediaplaylistprovider.h +++ b/src/multimediakit/qlocalmediaplaylistprovider.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/qmediabindableinterface.cpp b/src/multimediakit/qmediabindableinterface.cpp index 391d00d2b..28b713457 100644 --- a/src/multimediakit/qmediabindableinterface.cpp +++ b/src/multimediakit/qmediabindableinterface.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/qmediabindableinterface.h b/src/multimediakit/qmediabindableinterface.h index 09f6d6e3a..68e11fa2d 100644 --- a/src/multimediakit/qmediabindableinterface.h +++ b/src/multimediakit/qmediabindableinterface.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/qmediacontainercontrol.cpp b/src/multimediakit/qmediacontainercontrol.cpp index 512c96211..281c957fa 100644 --- a/src/multimediakit/qmediacontainercontrol.cpp +++ b/src/multimediakit/qmediacontainercontrol.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/qmediacontainercontrol.h b/src/multimediakit/qmediacontainercontrol.h index de26fc480..162b9af25 100644 --- a/src/multimediakit/qmediacontainercontrol.h +++ b/src/multimediakit/qmediacontainercontrol.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/qmediacontent.cpp b/src/multimediakit/qmediacontent.cpp index d8ead6326..8cd7e2d95 100644 --- a/src/multimediakit/qmediacontent.cpp +++ b/src/multimediakit/qmediacontent.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/qmediacontent.h b/src/multimediakit/qmediacontent.h index 66db3d02f..73e156f0d 100644 --- a/src/multimediakit/qmediacontent.h +++ b/src/multimediakit/qmediacontent.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 "qmediaresource.h" -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> QT_BEGIN_NAMESPACE diff --git a/src/multimediakit/qmediacontrol.cpp b/src/multimediakit/qmediacontrol.cpp index 2e624d2df..b47d694c1 100644 --- a/src/multimediakit/qmediacontrol.cpp +++ b/src/multimediakit/qmediacontrol.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/qmediacontrol.h b/src/multimediakit/qmediacontrol.h index f330122d8..171e95bae 100644 --- a/src/multimediakit/qmediacontrol.h +++ b/src/multimediakit/qmediacontrol.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 QABSTRACTMEDIACONTROL_H #define QABSTRACTMEDIACONTROL_H -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include <QtCore/qobject.h> #include <QtCore/qstring.h> diff --git a/src/multimediakit/qmediacontrol_p.h b/src/multimediakit/qmediacontrol_p.h index e7e5b6160..baf5b8e5c 100644 --- a/src/multimediakit/qmediacontrol_p.h +++ b/src/multimediakit/qmediacontrol_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> QT_BEGIN_NAMESPACE diff --git a/src/multimediakit/qmediaencodersettings.cpp b/src/multimediakit/qmediaencodersettings.cpp index b67324fc5..a87ed6883 100644 --- a/src/multimediakit/qmediaencodersettings.cpp +++ b/src/multimediakit/qmediaencodersettings.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/qmediaencodersettings.h b/src/multimediakit/qmediaencodersettings.h index 1662b59c3..a37d11202 100644 --- a/src/multimediakit/qmediaencodersettings.h +++ b/src/multimediakit/qmediaencodersettings.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/qsharedpointer.h> #include <QtCore/qstring.h> #include <QtCore/qsize.h> -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include "qtmedianamespace.h" QT_BEGIN_NAMESPACE diff --git a/src/multimediakit/qmediaenumdebug.h b/src/multimediakit/qmediaenumdebug.h index 60530e3fd..5110a1816 100644 --- a/src/multimediakit/qmediaenumdebug.h +++ b/src/multimediakit/qmediaenumdebug.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/qmediaimageviewer.cpp b/src/multimediakit/qmediaimageviewer.cpp index 4baaf6bad..1a5e659f1 100644 --- a/src/multimediakit/qmediaimageviewer.cpp +++ b/src/multimediakit/qmediaimageviewer.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/qmediaimageviewer.h b/src/multimediakit/qmediaimageviewer.h index f277f8520..8c6116851 100644 --- a/src/multimediakit/qmediaimageviewer.h +++ b/src/multimediakit/qmediaimageviewer.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/qmediaimageviewerservice.cpp b/src/multimediakit/qmediaimageviewerservice.cpp index 9d00fd0b9..869872c54 100644 --- a/src/multimediakit/qmediaimageviewerservice.cpp +++ b/src/multimediakit/qmediaimageviewerservice.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/qmediaimageviewerservice_p.h b/src/multimediakit/qmediaimageviewerservice_p.h index 5d4811da9..55d36c8cb 100644 --- a/src/multimediakit/qmediaimageviewerservice_p.h +++ b/src/multimediakit/qmediaimageviewerservice_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 <qmediaservice.h> #include <qmediaimageviewer.h> #include <qvideorenderercontrol.h> diff --git a/src/multimediakit/qmedianetworkaccesscontrol.cpp b/src/multimediakit/qmedianetworkaccesscontrol.cpp index e5bdc840f..707e24c4b 100644 --- a/src/multimediakit/qmedianetworkaccesscontrol.cpp +++ b/src/multimediakit/qmedianetworkaccesscontrol.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/qmedianetworkaccesscontrol.h b/src/multimediakit/qmedianetworkaccesscontrol.h index 65d693bb9..f16edfb8e 100644 --- a/src/multimediakit/qmedianetworkaccesscontrol.h +++ b/src/multimediakit/qmedianetworkaccesscontrol.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/qmediaobject.cpp b/src/multimediakit/qmediaobject.cpp index a3c9007c5..3276a2b44 100644 --- a/src/multimediakit/qmediaobject.cpp +++ b/src/multimediakit/qmediaobject.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/qmediaobject.h b/src/multimediakit/qmediaobject.h index 604544b6b..081764f1e 100644 --- a/src/multimediakit/qmediaobject.h +++ b/src/multimediakit/qmediaobject.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/qobject.h> #include <QtCore/qstringlist.h> -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include "qtmedianamespace.h" QT_BEGIN_NAMESPACE diff --git a/src/multimediakit/qmediaobject_p.h b/src/multimediakit/qmediaobject_p.h index a0d307227..53225d6c0 100644 --- a/src/multimediakit/qmediaobject_p.h +++ b/src/multimediakit/qmediaobject_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/qmediaplayer.cpp b/src/multimediakit/qmediaplayer.cpp index be3825861..75e414f6d 100644 --- a/src/multimediakit/qmediaplayer.cpp +++ b/src/multimediakit/qmediaplayer.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/qmediaplayer.h b/src/multimediakit/qmediaplayer.h index 444edb9ef..8361c3efa 100644 --- a/src/multimediakit/qmediaplayer.h +++ b/src/multimediakit/qmediaplayer.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/qmediaplayercontrol.cpp b/src/multimediakit/qmediaplayercontrol.cpp index 255a63438..56eecfb7d 100644 --- a/src/multimediakit/qmediaplayercontrol.cpp +++ b/src/multimediakit/qmediaplayercontrol.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/qmediaplayercontrol.h b/src/multimediakit/qmediaplayercontrol.h index 842371c62..c83099d8c 100644 --- a/src/multimediakit/qmediaplayercontrol.h +++ b/src/multimediakit/qmediaplayercontrol.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/qmediaplaylist.cpp b/src/multimediakit/qmediaplaylist.cpp index 93a91847a..a1690ba24 100644 --- a/src/multimediakit/qmediaplaylist.cpp +++ b/src/multimediakit/qmediaplaylist.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/qmediaplaylist.h b/src/multimediakit/qmediaplaylist.h index 4e82c5fae..ea48c3deb 100644 --- a/src/multimediakit/qmediaplaylist.h +++ b/src/multimediakit/qmediaplaylist.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/qmediaplaylist_p.h b/src/multimediakit/qmediaplaylist_p.h index d029a68d4..12a257f04 100644 --- a/src/multimediakit/qmediaplaylist_p.h +++ b/src/multimediakit/qmediaplaylist_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/qmediaplaylistcontrol.cpp b/src/multimediakit/qmediaplaylistcontrol.cpp index 47b4b5794..856502801 100644 --- a/src/multimediakit/qmediaplaylistcontrol.cpp +++ b/src/multimediakit/qmediaplaylistcontrol.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/qmediaplaylistcontrol.h b/src/multimediakit/qmediaplaylistcontrol.h index ff113135a..5a65fef59 100644 --- a/src/multimediakit/qmediaplaylistcontrol.h +++ b/src/multimediakit/qmediaplaylistcontrol.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/qmediaplaylistioplugin.cpp b/src/multimediakit/qmediaplaylistioplugin.cpp index f0b5196f4..28afbc7bd 100644 --- a/src/multimediakit/qmediaplaylistioplugin.cpp +++ b/src/multimediakit/qmediaplaylistioplugin.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/qmediaplaylistioplugin.h b/src/multimediakit/qmediaplaylistioplugin.h index aa5f4fd95..2d792df16 100644 --- a/src/multimediakit/qmediaplaylistioplugin.h +++ b/src/multimediakit/qmediaplaylistioplugin.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/qplugin.h> #include <QtCore/qfactoryinterface.h> -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include "qmediacontent.h" diff --git a/src/multimediakit/qmediaplaylistnavigator.cpp b/src/multimediakit/qmediaplaylistnavigator.cpp index c3e358716..a4d38e4a1 100644 --- a/src/multimediakit/qmediaplaylistnavigator.cpp +++ b/src/multimediakit/qmediaplaylistnavigator.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/qmediaplaylistnavigator.h b/src/multimediakit/qmediaplaylistnavigator.h index e19686a7a..4f2e15dbf 100644 --- a/src/multimediakit/qmediaplaylistnavigator.h +++ b/src/multimediakit/qmediaplaylistnavigator.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/qmediaplaylistprovider.cpp b/src/multimediakit/qmediaplaylistprovider.cpp index 5c892b79e..81cd7a7fc 100644 --- a/src/multimediakit/qmediaplaylistprovider.cpp +++ b/src/multimediakit/qmediaplaylistprovider.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/qmediaplaylistprovider.h b/src/multimediakit/qmediaplaylistprovider.h index 2fde87bc8..07723810c 100644 --- a/src/multimediakit/qmediaplaylistprovider.h +++ b/src/multimediakit/qmediaplaylistprovider.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/qmediaplaylistprovider_p.h b/src/multimediakit/qmediaplaylistprovider_p.h index ded31a7b2..1ca28f9e9 100644 --- a/src/multimediakit/qmediaplaylistprovider_p.h +++ b/src/multimediakit/qmediaplaylistprovider_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/qmediaplaylistsourcecontrol.cpp b/src/multimediakit/qmediaplaylistsourcecontrol.cpp index e8feaf07b..99b96fadf 100644 --- a/src/multimediakit/qmediaplaylistsourcecontrol.cpp +++ b/src/multimediakit/qmediaplaylistsourcecontrol.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/qmediaplaylistsourcecontrol.h b/src/multimediakit/qmediaplaylistsourcecontrol.h index d9b40392e..e55287fbc 100644 --- a/src/multimediakit/qmediaplaylistsourcecontrol.h +++ b/src/multimediakit/qmediaplaylistsourcecontrol.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/qmediapluginloader.cpp b/src/multimediakit/qmediapluginloader.cpp index 59676a2db..32f336959 100644 --- a/src/multimediakit/qmediapluginloader.cpp +++ b/src/multimediakit/qmediapluginloader.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/qmediapluginloader_p.h b/src/multimediakit/qmediapluginloader_p.h index eef395a33..0c4ad767b 100644 --- a/src/multimediakit/qmediapluginloader_p.h +++ b/src/multimediakit/qmediapluginloader_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 <QtCore/qobject.h> #include <QtCore/qstring.h> #include <QtCore/qstringlist.h> diff --git a/src/multimediakit/qmediarecorder.cpp b/src/multimediakit/qmediarecorder.cpp index 1b5601249..1c08e28a5 100644 --- a/src/multimediakit/qmediarecorder.cpp +++ b/src/multimediakit/qmediarecorder.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/qmediarecorder.h b/src/multimediakit/qmediarecorder.h index 4f5d6fd69..53e829526 100644 --- a/src/multimediakit/qmediarecorder.h +++ b/src/multimediakit/qmediarecorder.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/qmediarecordercontrol.cpp b/src/multimediakit/qmediarecordercontrol.cpp index 2b88ee9ef..d76603d75 100644 --- a/src/multimediakit/qmediarecordercontrol.cpp +++ b/src/multimediakit/qmediarecordercontrol.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/qmediarecordercontrol.h b/src/multimediakit/qmediarecordercontrol.h index bc5bf71be..f7ef516b9 100644 --- a/src/multimediakit/qmediarecordercontrol.h +++ b/src/multimediakit/qmediarecordercontrol.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/qmediaresource.cpp b/src/multimediakit/qmediaresource.cpp index a0dddb103..84f4e6c68 100644 --- a/src/multimediakit/qmediaresource.cpp +++ b/src/multimediakit/qmediaresource.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/qmediaresource.h b/src/multimediakit/qmediaresource.h index 0dd930cc2..6b2738181 100644 --- a/src/multimediakit/qmediaresource.h +++ b/src/multimediakit/qmediaresource.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/qmetatype.h> #include <QtNetwork/qnetworkrequest.h> -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> QT_BEGIN_NAMESPACE diff --git a/src/multimediakit/qmediaservice.cpp b/src/multimediakit/qmediaservice.cpp index 6ea6fa20c..50f6c8f70 100644 --- a/src/multimediakit/qmediaservice.cpp +++ b/src/multimediakit/qmediaservice.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/qmediaservice.h b/src/multimediakit/qmediaservice.h index 57ae3bba3..77e1615ae 100644 --- a/src/multimediakit/qmediaservice.h +++ b/src/multimediakit/qmediaservice.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 QABSTRACTMEDIASERVICE_H #define QABSTRACTMEDIASERVICE_H -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include <QtCore/qobject.h> #include <QtCore/qstringlist.h> diff --git a/src/multimediakit/qmediaservice_p.h b/src/multimediakit/qmediaservice_p.h index 37eac75ca..a0f0b6b7f 100644 --- a/src/multimediakit/qmediaservice_p.h +++ b/src/multimediakit/qmediaservice_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/qmediaserviceprovider.cpp b/src/multimediakit/qmediaserviceprovider.cpp index 74db5a2e0..dab7fe00d 100644 --- a/src/multimediakit/qmediaserviceprovider.cpp +++ b/src/multimediakit/qmediaserviceprovider.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/qmediaserviceprovider.h b/src/multimediakit/qmediaserviceprovider.h index 997f371f5..d9a789bf4 100644 --- a/src/multimediakit/qmediaserviceprovider.h +++ b/src/multimediakit/qmediaserviceprovider.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 @@ -44,7 +44,7 @@ #include <QtCore/qobject.h> #include <QtCore/qshareddata.h> -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include "qtmedianamespace.h" QT_BEGIN_NAMESPACE diff --git a/src/multimediakit/qmediaserviceproviderplugin.h b/src/multimediakit/qmediaserviceproviderplugin.h index 767dd4949..6cf45fda4 100644 --- a/src/multimediakit/qmediaserviceproviderplugin.h +++ b/src/multimediakit/qmediaserviceproviderplugin.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/qstringlist.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include "qmediaserviceprovider.h" #ifdef Q_MOC_RUN diff --git a/src/multimediakit/qmediastreamscontrol.cpp b/src/multimediakit/qmediastreamscontrol.cpp index 3b4e668b3..91aed77ab 100644 --- a/src/multimediakit/qmediastreamscontrol.cpp +++ b/src/multimediakit/qmediastreamscontrol.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/qmediastreamscontrol.h b/src/multimediakit/qmediastreamscontrol.h index a5ee71e3e..dd5468ee2 100644 --- a/src/multimediakit/qmediastreamscontrol.h +++ b/src/multimediakit/qmediastreamscontrol.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 "qmediacontrol.h" #include "qtmedianamespace.h" -#include "qmobilityglobal.h" +#include "qtmultimediakitdefs.h" #include <qmediaenumdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/multimediakit/qmediatimerange.cpp b/src/multimediakit/qmediatimerange.cpp index 9183f0ae1..6da9fd640 100644 --- a/src/multimediakit/qmediatimerange.cpp +++ b/src/multimediakit/qmediatimerange.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/qmediatimerange.h b/src/multimediakit/qmediatimerange.h index cb236c688..15ef12691 100644 --- a/src/multimediakit/qmediatimerange.h +++ b/src/multimediakit/qmediatimerange.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 QMEDIATIMERANGE_H #define QMEDIATIMERANGE_H -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include "qtmedianamespace.h" #include <QtCore/qshareddata.h> diff --git a/src/multimediakit/qmetadatareadercontrol.cpp b/src/multimediakit/qmetadatareadercontrol.cpp index 8f9b86acb..c877201d8 100644 --- a/src/multimediakit/qmetadatareadercontrol.cpp +++ b/src/multimediakit/qmetadatareadercontrol.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/qmetadatareadercontrol.h b/src/multimediakit/qmetadatareadercontrol.h index a2c7d8184..cb0ed7387 100644 --- a/src/multimediakit/qmetadatareadercontrol.h +++ b/src/multimediakit/qmetadatareadercontrol.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 <qmediaresource.h> -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include "qtmedianamespace.h" QT_BEGIN_NAMESPACE diff --git a/src/multimediakit/qmetadatawritercontrol.cpp b/src/multimediakit/qmetadatawritercontrol.cpp index 45b81541c..2b7c1b2a4 100644 --- a/src/multimediakit/qmetadatawritercontrol.cpp +++ b/src/multimediakit/qmetadatawritercontrol.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/qmetadatawritercontrol.h b/src/multimediakit/qmetadatawritercontrol.h index 1e3388426..417e91abb 100644 --- a/src/multimediakit/qmetadatawritercontrol.h +++ b/src/multimediakit/qmetadatawritercontrol.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 "qmediaresource.h" -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include "qtmedianamespace.h" QT_BEGIN_NAMESPACE diff --git a/src/multimediakit/qmobilityglobal.h b/src/multimediakit/qmobilityglobal.h deleted file mode 100644 index 069c82d7c..000000000 --- a/src/multimediakit/qmobilityglobal.h +++ /dev/null @@ -1,229 +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 Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QMOBILITYGLOBAL_H -#define QMOBILITYGLOBAL_H - -#define QTM_VERSION_STR "1.2.0" -/* - QTM_VERSION is (major << 16) + (minor << 8) + patch. -*/ -#define QTM_VERSION 0x010200 -/* - can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 2, 0)) -*/ -#define QTM_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) - -#define QTM_PACKAGEDATE_STR "YYYY-MM-DD" - -#define QTM_PACKAGE_TAG "" - -#include <QtCore/qglobal.h> -#if defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN)) && defined(QT_MAKEDLL) -# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN)) && defined(QT_DLL) -# define QM_AUTOTEST_EXPORT Q_DECL_IMPORT -#elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN)) && defined(QT_SHARED) -# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT -#else -# define QM_AUTOTEST_EXPORT -#endif - - -#if defined(Q_OS_WIN) -# if defined(QT_NODLL) -# undef QT_MAKEDLL -# undef QT_DLL -# elif defined(QT_MAKEDLL) -# if defined(QT_DLL) -# undef QT_DLL -# endif -# if defined(QT_BUILD_BEARER_LIB) -# define Q_BEARER_EXPORT Q_DECL_EXPORT -# else -# define Q_BEARER_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_CFW_LIB) -# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT -# else -# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_CONTACTS_LIB) -# define Q_CONTACTS_EXPORT Q_DECL_EXPORT -# else -# define Q_CONTACTS_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_VERSIT_LIB) -# define Q_VERSIT_EXPORT Q_DECL_EXPORT -# else -# define Q_VERSIT_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_VERSIT_ORGANIZER_LIB) -# define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_EXPORT -# else -# define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_LOCATION_LIB) -# define Q_LOCATION_EXPORT Q_DECL_EXPORT -# else -# define Q_LOCATION_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_MESSAGING_LIB) -# define Q_MESSAGING_EXPORT Q_DECL_EXPORT -# else -# define Q_MESSAGING_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_MULTIMEDIA_LIB) -# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT -# else -# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_SFW_LIB) -# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT -# else -# define Q_SERVICEFW_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_SYSINFO_LIB) -# define Q_SYSINFO_EXPORT Q_DECL_EXPORT -# else -# define Q_SYSINFO_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_SENSORS_LIB) -# define Q_SENSORS_EXPORT Q_DECL_EXPORT -# else -# define Q_SENSORS_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_FEEDBACK_LIB) -# define Q_FEEDBACK_EXPORT Q_DECL_EXPORT -# else -# define Q_FEEDBACK_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_GALLERY_LIB) -# define Q_GALLERY_EXPORT Q_DECL_EXPORT -# else -# define Q_GALLERY_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_ORGANIZER_LIB) -# define Q_ORGANIZER_EXPORT Q_DECL_EXPORT -# else -# define Q_ORGANIZER_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_CONNECTIVITY_LIB) -# define Q_CONNECTIVITY_EXPORT Q_DECL_EXPORT -# else -# define Q_CONNECTIVITY_EXPORT Q_DECL_IMPORT -# endif -# elif defined(QT_DLL) /* use a Qt DLL library */ -# define Q_BEARER_EXPORT Q_DECL_IMPORT -# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT -# define Q_CONTACTS_EXPORT Q_DECL_IMPORT -# define Q_VERSIT_EXPORT Q_DECL_IMPORT -# define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_IMPORT -# define Q_LOCATION_EXPORT Q_DECL_IMPORT -# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT -# define Q_MESSAGING_EXPORT Q_DECL_IMPORT -# define Q_SYSINFO_EXPORT Q_DECL_IMPORT -# define Q_SENSORS_EXPORT Q_DECL_IMPORT -# define Q_FEEDBACK_EXPORT Q_DECL_IMPORT -# define Q_GALLERY_EXPORT Q_DECL_IMPORT -# define Q_ORGANIZER_EXPORT Q_DECL_IMPORT -# define Q_CONNECTIVITY_EXPORT Q_DECL_IMPORT -# endif -#endif - -#if !defined(Q_SERVICEFW_EXPORT) -# if defined(QT_SHARED) -# define Q_BEARER_EXPORT Q_DECL_EXPORT -# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT -# define Q_CONTACTS_EXPORT Q_DECL_EXPORT -# define Q_VERSIT_EXPORT Q_DECL_EXPORT -# define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_EXPORT -# define Q_LOCATION_EXPORT Q_DECL_EXPORT -# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT -# define Q_MESSAGING_EXPORT Q_DECL_EXPORT -# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT -# define Q_SYSINFO_EXPORT Q_DECL_EXPORT -# define Q_SENSORS_EXPORT Q_DECL_EXPORT -# define Q_FEEDBACK_EXPORT Q_DECL_EXPORT -# define Q_GALLERY_EXPORT Q_DECL_EXPORT -# define Q_ORGANIZER_EXPORT Q_DECL_EXPORT -# define Q_CONNECTIVITY_EXPORT Q_DECL_EXPORT -# else -# define Q_BEARER_EXPORT -# define Q_PUBLISHSUBSCRIBE_EXPORT -# define Q_CONTACTS_EXPORT -# define Q_VERSIT_EXPORT -# define Q_VERSIT_ORGANIZER_EXPORT -# define Q_LOCATION_EXPORT -# define Q_MULTIMEDIA_EXPORT -# define Q_MESSAGING_EXPORT -# define Q_SERVICEFW_EXPORT -# define Q_SYSINFO_EXPORT -# define Q_SENSORS_EXPORT -# define Q_FEEDBACK_EXPORT -# define Q_GALLERY_EXPORT -# define Q_ORGANIZER_EXPORT -# define Q_CONNECTIVITY_EXPORT -# endif -#endif - - -// The namespace is hardcoded as moc has issues resolving -// macros which would be a prerequisite for a dynmamic namespace -#define QTM_NAMESPACE QtMobility - -#ifdef QTM_NAMESPACE -# define QTM_PREPEND_NAMESPACE(name) ::QTM_NAMESPACE::name -# define QTM_BEGIN_NAMESPACE namespace QTM_NAMESPACE { -# define QTM_END_NAMESPACE } -# define QTM_USE_NAMESPACE using namespace QTM_NAMESPACE; -#else -# define QTM_PREPEND_NAMESPACE(name) ::name -# define QTM_BEGIN_NAMESPACE -# define QTM_END_NAMESPACE -# define QTM_USE_NAMESPACE -#endif - -//in case Qt is in namespace -QT_USE_NAMESPACE - -#endif // QMOBILITYGLOBAL_H - diff --git a/src/multimediakit/qpaintervideosurface.cpp b/src/multimediakit/qpaintervideosurface.cpp index 49148e870..bd82f7841 100644 --- a/src/multimediakit/qpaintervideosurface.cpp +++ b/src/multimediakit/qpaintervideosurface.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/qpaintervideosurface_mac.mm b/src/multimediakit/qpaintervideosurface_mac.mm index 51aae04bb..f366dad5c 100644 --- a/src/multimediakit/qpaintervideosurface_mac.mm +++ b/src/multimediakit/qpaintervideosurface_mac.mm @@ -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/qpaintervideosurface_mac_p.h b/src/multimediakit/qpaintervideosurface_mac_p.h index 9ec801218..667d4b5e3 100644 --- a/src/multimediakit/qpaintervideosurface_mac_p.h +++ b/src/multimediakit/qpaintervideosurface_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/qpaintervideosurface_p.h b/src/multimediakit/qpaintervideosurface_p.h index b48759479..19361ed5f 100644 --- a/src/multimediakit/qpaintervideosurface_p.h +++ b/src/multimediakit/qpaintervideosurface_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 <QtCore/qsize.h> #include <QtGui/qimage.h> #include <QtGui/qmatrix4x4.h> diff --git a/src/multimediakit/qradiotuner.cpp b/src/multimediakit/qradiotuner.cpp index 21a2b1c33..6398e2ba9 100644 --- a/src/multimediakit/qradiotuner.cpp +++ b/src/multimediakit/qradiotuner.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/qradiotuner.h b/src/multimediakit/qradiotuner.h index 31510cf0c..e88f8488d 100644 --- a/src/multimediakit/qradiotuner.h +++ b/src/multimediakit/qradiotuner.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/qradiotunercontrol.cpp b/src/multimediakit/qradiotunercontrol.cpp index 39c39b4b3..8587c8320 100644 --- a/src/multimediakit/qradiotunercontrol.cpp +++ b/src/multimediakit/qradiotunercontrol.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 @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include "qradiotunercontrol.h" #include "qmediacontrol_p.h" diff --git a/src/multimediakit/qradiotunercontrol.h b/src/multimediakit/qradiotunercontrol.h index d21946a98..6f9471700 100644 --- a/src/multimediakit/qradiotunercontrol.h +++ b/src/multimediakit/qradiotunercontrol.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/qtmedianamespace.h b/src/multimediakit/qtmedianamespace.h index 1f2b800ca..9e71617e2 100644 --- a/src/multimediakit/qtmedianamespace.h +++ b/src/multimediakit/qtmedianamespace.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/qpair.h> #include <QtCore/qmetatype.h> -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> QT_BEGIN_NAMESPACE diff --git a/src/multimediakit/qtmultimediakitdefs.h b/src/multimediakit/qtmultimediakitdefs.h new file mode 100644 index 000000000..d6ac059db --- /dev/null +++ b/src/multimediakit/qtmultimediakitdefs.h @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** 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 Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#ifndef QTMULTIMEDIAKIT_P_H +#define QTMULTIMEDIAKIT_P_H + +#include <QtCore/qglobal.h> + +#if defined(Q_OS_WIN) +# if defined(QT_NODLL) +# undef QT_MAKEDLL +# undef QT_DLL +# elif defined(QT_MAKEDLL) +# if defined(QT_DLL) +# undef QT_DLL +# endif +# if defined(QT_BUILD_MULTIMEDIA_LIB) +# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT +# else +# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT +# endif +# elif defined(QT_DLL) /* use a Qt DLL library */ +# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT +# endif +#endif + +#if !defined(Q_SERVICEFW_EXPORT) +# if defined(QT_SHARED) +# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT +# else +# define Q_MULTIMEDIA_EXPORT +# endif +#endif + +#endif // QMULTIMEDIAKIT_P_H + diff --git a/src/multimediakit/qvideodevicecontrol.cpp b/src/multimediakit/qvideodevicecontrol.cpp index 27fe122f9..3e0c4f58c 100644 --- a/src/multimediakit/qvideodevicecontrol.cpp +++ b/src/multimediakit/qvideodevicecontrol.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/qvideodevicecontrol.h b/src/multimediakit/qvideodevicecontrol.h index 0d204739c..260c15868 100644 --- a/src/multimediakit/qvideodevicecontrol.h +++ b/src/multimediakit/qvideodevicecontrol.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/qvideoencodercontrol.cpp b/src/multimediakit/qvideoencodercontrol.cpp index b06286f9b..a8c3be055 100644 --- a/src/multimediakit/qvideoencodercontrol.cpp +++ b/src/multimediakit/qvideoencodercontrol.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/qvideoencodercontrol.h b/src/multimediakit/qvideoencodercontrol.h index 2952d7a71..bf37a8364 100644 --- a/src/multimediakit/qvideoencodercontrol.h +++ b/src/multimediakit/qvideoencodercontrol.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/qvideorenderercontrol.cpp b/src/multimediakit/qvideorenderercontrol.cpp index 1368fb0b7..616485a00 100644 --- a/src/multimediakit/qvideorenderercontrol.cpp +++ b/src/multimediakit/qvideorenderercontrol.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/qvideorenderercontrol.h b/src/multimediakit/qvideorenderercontrol.h index aa815b986..70bc64f69 100644 --- a/src/multimediakit/qvideorenderercontrol.h +++ b/src/multimediakit/qvideorenderercontrol.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/qvideosurfaceoutput.cpp b/src/multimediakit/qvideosurfaceoutput.cpp index 9dfbaaa43..cdbec5596 100644 --- a/src/multimediakit/qvideosurfaceoutput.cpp +++ b/src/multimediakit/qvideosurfaceoutput.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/qvideosurfaceoutput_p.h b/src/multimediakit/qvideosurfaceoutput_p.h index 3ef93fd27..d74f73082 100644 --- a/src/multimediakit/qvideosurfaceoutput_p.h +++ b/src/multimediakit/qvideosurfaceoutput_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/qvideowidget.cpp b/src/multimediakit/qvideowidget.cpp index f3416a537..6ed9209c2 100644 --- a/src/multimediakit/qvideowidget.cpp +++ b/src/multimediakit/qvideowidget.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/qvideowidget.h b/src/multimediakit/qvideowidget.h index 87da76588..43c603ed4 100644 --- a/src/multimediakit/qvideowidget.h +++ b/src/multimediakit/qvideowidget.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 @@ -44,7 +44,7 @@ #include <QtGui/qwidget.h> -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include <qmediabindableinterface.h> QT_BEGIN_NAMESPACE diff --git a/src/multimediakit/qvideowidget_p.h b/src/multimediakit/qvideowidget_p.h index b5cc704f4..4676cb6b9 100644 --- a/src/multimediakit/qvideowidget_p.h +++ b/src/multimediakit/qvideowidget_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 "qvideowidget.h" #ifndef QT_NO_OPENGL diff --git a/src/multimediakit/qvideowidgetcontrol.cpp b/src/multimediakit/qvideowidgetcontrol.cpp index e6e5743ec..cd29cbd8c 100644 --- a/src/multimediakit/qvideowidgetcontrol.cpp +++ b/src/multimediakit/qvideowidgetcontrol.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/qvideowidgetcontrol.h b/src/multimediakit/qvideowidgetcontrol.h index 44e11bedc..d5797918d 100644 --- a/src/multimediakit/qvideowidgetcontrol.h +++ b/src/multimediakit/qvideowidgetcontrol.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/qvideowindowcontrol.cpp b/src/multimediakit/qvideowindowcontrol.cpp index fec15e002..0adcfec06 100644 --- a/src/multimediakit/qvideowindowcontrol.cpp +++ b/src/multimediakit/qvideowindowcontrol.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/qvideowindowcontrol.h b/src/multimediakit/qvideowindowcontrol.h index addb0b633..c48294d85 100644 --- a/src/multimediakit/qvideowindowcontrol.h +++ b/src/multimediakit/qvideowindowcontrol.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/video/qabstractvideobuffer.cpp b/src/multimediakit/video/qabstractvideobuffer.cpp index 2ed2ddad5..8704e40fc 100644 --- a/src/multimediakit/video/qabstractvideobuffer.cpp +++ b/src/multimediakit/video/qabstractvideobuffer.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/video/qabstractvideobuffer.h b/src/multimediakit/video/qabstractvideobuffer.h index 44f4247e7..25e63825a 100644 --- a/src/multimediakit/video/qabstractvideobuffer.h +++ b/src/multimediakit/video/qabstractvideobuffer.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 QABSTRACTVIDEOBUFFER_H #define QABSTRACTVIDEOBUFFER_H -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include <qtmedianamespace.h> diff --git a/src/multimediakit/video/qabstractvideobuffer_p.h b/src/multimediakit/video/qabstractvideobuffer_p.h index acfa1ee74..2d2107e8a 100644 --- a/src/multimediakit/video/qabstractvideobuffer_p.h +++ b/src/multimediakit/video/qabstractvideobuffer_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/qshareddata.h> #include "qabstractvideobuffer.h" -#include <qmobilityglobal.h> +#include <qtmultimediakitdefs.h> #include <qtmedianamespace.h> diff --git a/src/multimediakit/video/qabstractvideosurface.cpp b/src/multimediakit/video/qabstractvideosurface.cpp index 59c55c242..13c2b25de 100644 --- a/src/multimediakit/video/qabstractvideosurface.cpp +++ b/src/multimediakit/video/qabstractvideosurface.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/video/qabstractvideosurface.h b/src/multimediakit/video/qabstractvideosurface.h index a23b31698..d473a9263 100644 --- a/src/multimediakit/video/qabstractvideosurface.h +++ b/src/multimediakit/video/qabstractvideosurface.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/video/qimagevideobuffer.cpp b/src/multimediakit/video/qimagevideobuffer.cpp index 0c932ff90..e16abc30b 100644 --- a/src/multimediakit/video/qimagevideobuffer.cpp +++ b/src/multimediakit/video/qimagevideobuffer.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/video/qimagevideobuffer_p.h b/src/multimediakit/video/qimagevideobuffer_p.h index 993ec57b4..2432f5dcf 100644 --- a/src/multimediakit/video/qimagevideobuffer_p.h +++ b/src/multimediakit/video/qimagevideobuffer_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/video/qmemoryvideobuffer.cpp b/src/multimediakit/video/qmemoryvideobuffer.cpp index 92d16a264..d3516182a 100644 --- a/src/multimediakit/video/qmemoryvideobuffer.cpp +++ b/src/multimediakit/video/qmemoryvideobuffer.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 @@ -64,7 +64,6 @@ public: \class QMemoryVideoBuffer \brief The QMemoryVideoBuffer class provides a system memory allocated video data buffer. \internal - \since QtMobility 1.0 QMemoryVideoBuffer is the default video buffer for allocating system memory. It may be used to allocate memory for a QVideoFrame without implementing your own QAbstractVideoBuffer. diff --git a/src/multimediakit/video/qmemoryvideobuffer_p.h b/src/multimediakit/video/qmemoryvideobuffer_p.h index 1889df0e2..06d7d70cf 100644 --- a/src/multimediakit/video/qmemoryvideobuffer_p.h +++ b/src/multimediakit/video/qmemoryvideobuffer_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/video/qvideoframe.cpp b/src/multimediakit/video/qvideoframe.cpp index f974e3294..9286f898f 100644 --- a/src/multimediakit/video/qvideoframe.cpp +++ b/src/multimediakit/video/qvideoframe.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/video/qvideoframe.h b/src/multimediakit/video/qvideoframe.h index 8d90dbb96..20890b4e8 100644 --- a/src/multimediakit/video/qvideoframe.h +++ b/src/multimediakit/video/qvideoframe.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/video/qvideosurfaceformat.cpp b/src/multimediakit/video/qvideosurfaceformat.cpp index c384093ef..da27b5f41 100644 --- a/src/multimediakit/video/qvideosurfaceformat.cpp +++ b/src/multimediakit/video/qvideosurfaceformat.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/video/qvideosurfaceformat.h b/src/multimediakit/video/qvideosurfaceformat.h index 7baf18fd8..3fed1991e 100644 --- a/src/multimediakit/video/qvideosurfaceformat.h +++ b/src/multimediakit/video/qvideosurfaceformat.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 |