summaryrefslogtreecommitdiffstats
path: root/src/multimedia/multimedia.pro
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2012-11-01 00:42:35 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-06 18:20:09 +0100
commit47fe5f9b39575130fa7e5c3e05ec7775bbf81c99 (patch)
treeb6651cb78569fcf30edd3bc1fc82ea1661302be9 /src/multimedia/multimedia.pro
parent832c3929f2222e0e10ada33549c9d1cf90373018 (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/multimedia.pro')
-rw-r--r--src/multimedia/multimedia.pro6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 7df18e527..e8ced991c 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -31,7 +31,7 @@ PUBLIC_HEADERS += \
qmediaservice.h \
qmediaserviceproviderplugin.h \
qmediatimerange.h \
- qtmedianamespace.h \
+ qmultimedia.h \
qtmultimediadefs.h \
SOURCES += \
@@ -43,10 +43,10 @@ SOURCES += \
qmediaservice.cpp \
qmediaserviceprovider.cpp \
qmediatimerange.cpp \
- qtmedianamespace.cpp \
qmediaresourcepolicyplugin_p.cpp \
qmediaresourcepolicy_p.cpp \
- qmediaresourceset_p.cpp
+ qmediaresourceset_p.cpp \
+ qmultimedia.cpp
include(audio/audio.pri)
include(camera/camera.pri)