diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 03:44:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 03:44:48 (GMT) |
| commit | 74871dc5730c8a44e71ee9efcf47f94384f36387 (patch) | |
| tree | da1690ff3efe0b547d384698d4837b4e073660f3 /src/3rdparty/phonon/mmf/stereowidening.cpp | |
| parent | f65a93476422627342404f33a755ae543047eaed (diff) | |
| parent | 656fd8d3f308205c811a8b1b1c9230ce5f8fc49e (diff) | |
| download | Qt-74871dc5730c8a44e71ee9efcf47f94384f36387.zip Qt-74871dc5730c8a44e71ee9efcf47f94384f36387.tar.gz Qt-74871dc5730c8a44e71ee9efcf47f94384f36387.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Use lower case for including system header files
Added trace statements to Phonon MMF backend
MMF Phonon backend: call winId() from VideoWidget constructor
Fixed crash which occurs when switching between video clips
Close media clip before creating new player object
Enable bufferStatus signal during video clip loading on NGA platforms
Prevent crash when video is played without a VideoWidget
Diffstat (limited to 'src/3rdparty/phonon/mmf/stereowidening.cpp')
| -rw-r--r-- | src/3rdparty/phonon/mmf/stereowidening.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/stereowidening.cpp b/src/3rdparty/phonon/mmf/stereowidening.cpp index f90651b..e452160 100644 --- a/src/3rdparty/phonon/mmf/stereowidening.cpp +++ b/src/3rdparty/phonon/mmf/stereowidening.cpp @@ -16,7 +16,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. */ -#include <StereoWideningBase.h> +#include <stereowideningbase.h> #include "stereowidening.h" QT_BEGIN_NAMESPACE |