diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-15 07:06:39 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-15 07:06:39 (GMT) |
| commit | 519bf02008b8e6f1bf5154ce5c384049c3ebb0d7 (patch) | |
| tree | aa325674b7f86749d630f5eb587651007f6a10ca /src/multimedia | |
| parent | 6e189eb28161f2d09e0c71ecd590b7ccfd82321c (diff) | |
| parent | 414ff1be28af440f1e01a38e497227f3849e8e54 (diff) | |
| download | Qt-519bf02008b8e6f1bf5154ce5c384049c3ebb0d7.zip Qt-519bf02008b8e6f1bf5154ce5c384049c3ebb0d7.tar.gz Qt-519bf02008b8e6f1bf5154ce5c384049c3ebb0d7.tar.bz2 | |
Merge remote branch 'staging/4.7' into bearermanagement/qconfig
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/effects/qsoundeffect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/effects/qsoundeffect.cpp b/src/multimedia/effects/qsoundeffect.cpp index 8a38103..d34e532 100644 --- a/src/multimedia/effects/qsoundeffect.cpp +++ b/src/multimedia/effects/qsoundeffect.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE The following example plays a wav file on mouse click. \qml - import Qt 4.6 + import Qt 4.7 import Qt.multimedia 4.7 Item { |