diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-23 01:34:30 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-23 01:34:30 (GMT) |
| commit | 4b1a9e65bb989e7edcaa0bc0be9924885e7e06c9 (patch) | |
| tree | b44c82c7a3f90e9824f0fc7db9e671051b1bce24 | |
| parent | 6ffb4e1e8d56d1fab58fcaa369afde33fd983c1f (diff) | |
| download | Qt-4b1a9e65bb989e7edcaa0bc0be9924885e7e06c9.zip Qt-4b1a9e65bb989e7edcaa0bc0be9924885e7e06c9.tar.gz Qt-4b1a9e65bb989e7edcaa0bc0be9924885e7e06c9.tar.bz2 | |
Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
Reviewed-by: Nicholas Young
| -rw-r--r-- | src/multimedia/qml/multimediaqml.cpp (renamed from src/multimedia/qml/qml.cpp) | 2 | ||||
| -rw-r--r-- | src/multimedia/qml/multimediaqml.h (renamed from src/multimedia/qml/qml.h) | 0 | ||||
| -rw-r--r-- | src/multimedia/qml/qml.pri | 4 | ||||
| -rw-r--r-- | src/plugins/qmlmodules/multimedia/multimedia.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/qml/qml.cpp b/src/multimedia/qml/multimediaqml.cpp index b9ee212..be49915 100644 --- a/src/multimedia/qml/qml.cpp +++ b/src/multimedia/qml/multimediaqml.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtMultimedia/qml.h> +#include <QtMultimedia/multimediaqml.h> #include <QtMultimedia/private/qsoundeffect_p.h> #include <QtMultimedia/private/qmlaudio_p.h> #include <QtMultimedia/private/qmlgraphicsvideo_p.h> diff --git a/src/multimedia/qml/qml.h b/src/multimedia/qml/multimediaqml.h index 41274c8..41274c8 100644 --- a/src/multimedia/qml/qml.h +++ b/src/multimedia/qml/multimediaqml.h diff --git a/src/multimedia/qml/qml.pri b/src/multimedia/qml/qml.pri index e506632..a7ca02e 100644 --- a/src/multimedia/qml/qml.pri +++ b/src/multimedia/qml/qml.pri @@ -17,7 +17,7 @@ contains(QT_CONFIG, declarative) { } HEADERS += \ - $$PWD/qml.h \ + $$PWD/multimediaqml.h \ $$PWD/qmetadatacontrolmetaobject_p.h \ $$PWD/qmlaudio_p.h \ $$PWD/qmlgraphicsvideo_p.h \ @@ -26,7 +26,7 @@ contains(QT_CONFIG, declarative) { $$PWD/wavedecoder_p.h SOURCES += \ - $$PWD/qml.cpp \ + $$PWD/multimediaqml.cpp \ $$PWD/qmetadatacontrolmetaobject.cpp \ $$PWD/qmlaudio.cpp \ $$PWD/qmlgraphicsvideo.cpp \ diff --git a/src/plugins/qmlmodules/multimedia/multimedia.cpp b/src/plugins/qmlmodules/multimedia/multimedia.cpp index d9414ee..d192ed8 100644 --- a/src/plugins/qmlmodules/multimedia/multimedia.cpp +++ b/src/plugins/qmlmodules/multimedia/multimedia.cpp @@ -41,7 +41,7 @@ #include <QtDeclarative/qmlmoduleplugin.h> #include <QtDeclarative/qml.h> -#include <QtMultimedia/qml.h> +#include <QtMultimedia/multimediaqml.h> QT_BEGIN_NAMESPACE |