diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-11-01 00:42:35 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-06 18:20:09 +0100 |
| commit | 47fe5f9b39575130fa7e5c3e05ec7775bbf81c99 (patch) | |
| tree | b6651cb78569fcf30edd3bc1fc82ea1661302be9 /src/multimedia/controls | |
| parent | 832c3929f2222e0e10ada33549c9d1cf90373018 (diff) | |
Enable the "#include <QMultimedia>" camel-case header
Rename qtmedianamespace.h/cpp -> qmultimedia.h/cpp, and have
sync.profile generate the camel-case header during compilation.
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: Iade9ee6538970b4b9935f169eb2d9a0ea6949a95
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/multimedia/controls')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h index ee1b642f0..190e460d5 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ b/src/multimedia/controls/qmediaavailabilitycontrol.h @@ -44,7 +44,7 @@ #include <qmediacontrol.h> #include <qmediaobject.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> QT_BEGIN_HEADER diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index a1b0f2855..de13f95c4 100644 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ b/src/multimedia/controls/qmediastreamscontrol.h @@ -44,7 +44,7 @@ #define QMEDIASTREAMSCONTROL_H #include "qmediacontrol.h" -#include "qtmedianamespace.h" +#include "qmultimedia.h" #include "qtmultimediadefs.h" #include <qmediaenumdebug.h> diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index 5d1972cd8..1d9b94a82 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -48,7 +48,7 @@ #include <qmediaresource.h> #include <qtmultimediadefs.h> -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_HEADER diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index 88de69e2b..ecbf329ef 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -48,7 +48,7 @@ #include "qmediaresource.h" #include <qtmultimediadefs.h> -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_HEADER |