diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-24 16:40:49 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-24 16:40:49 (GMT) |
| commit | d380019ec6b434d6d393ab50d8c63f07c3f2533e (patch) | |
| tree | 088c3ad572c6ee0220fe05411743fa1b5d28cd0c /src/plugins/qmlmodules/multimedia/multimedia.cpp | |
| parent | 77670c3c0fdc3021356e212e94042a0b5a4f4f8c (diff) | |
| parent | ef30a6f336d55c813423bf139d8363f50181179f (diff) | |
| download | Qt-d380019ec6b434d6d393ab50d8c63f07c3f2533e.zip Qt-d380019ec6b434d6d393ab50d8c63f07c3f2533e.tar.gz Qt-d380019ec6b434d6d393ab50d8c63f07c3f2533e.tar.bz2 | |
Merge remote branch 'origin/master'
Conflicts:
configure
src/plugins/mediaservices/mediaservices.pro
Diffstat (limited to 'src/plugins/qmlmodules/multimedia/multimedia.cpp')
| -rw-r--r-- | src/plugins/qmlmodules/multimedia/multimedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |