diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-16 00:19:49 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-16 00:19:49 (GMT) |
| commit | be80bdf8bff864a21308ea58829949c84db8dbdf (patch) | |
| tree | a7a5fdafa3f754f7af34b7fe3bb91b39c173b853 /src/multimedia | |
| parent | 655088bc1942698ee060ca5237a4220365e49ee1 (diff) | |
| parent | cb935bb0fe6289017783223c065637b1defa47e6 (diff) | |
| download | Qt-be80bdf8bff864a21308ea58829949c84db8dbdf.zip Qt-be80bdf8bff864a21308ea58829949c84db8dbdf.tar.gz Qt-be80bdf8bff864a21308ea58829949c84db8dbdf.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp index e834280..3e3dd91 100644 --- a/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/mediaservices/effects/qsoundeffect_pulse_p.cpp @@ -51,7 +51,7 @@ // #include <QtCore/qcoreapplication.h> -#include <QtMediaservices/qaudioformat.h> +#include <QtMultimedia/qaudioformat.h> #include <QtNetwork> #include <QTime> |