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/recording | |
| 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/recording')
| -rw-r--r-- | src/multimedia/recording/qmediaencodersettings.h | 2 | ||||
| -rw-r--r-- | src/multimedia/recording/qmediarecorder.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/recording/qmediaencodersettings.h b/src/multimedia/recording/qmediaencodersettings.h index 3f9bae3a5..6cd3e5586 100644 --- a/src/multimedia/recording/qmediaencodersettings.h +++ b/src/multimedia/recording/qmediaencodersettings.h @@ -47,7 +47,7 @@ #include <QtCore/qsize.h> #include <QtCore/qvariant.h> #include <qtmultimediadefs.h> -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_HEADER diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 56ef888ed..1f27b6f35 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -42,7 +42,7 @@ #ifndef QMEDIARECORDER_H #define QMEDIARECORDER_H -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include <qmediaobject.h> #include <qmediaencodersettings.h> #include <qmediabindableinterface.h> |