From 47fe5f9b39575130fa7e5c3e05ec7775bbf81c99 Mon Sep 17 00:00:00 2001
From: Sze Howe Koh <szehowe.koh@gmail.com>
Date: Thu, 1 Nov 2012 00:42:35 +0800
Subject: 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>
---
 src/multimedia/recording/qmediaencodersettings.h | 2 +-
 src/multimedia/recording/qmediarecorder.h        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/multimedia/recording')

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>
-- 
cgit v1.2.3