summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-13 06:55:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-13 06:55:56 (GMT)
commit48e08ee5718b3de855ecea626179ad5323e38fa0 (patch)
treea0393670e7da7ce268b5581ef2c4750f2e5a4e07 /src/multimedia
parenta301ccba853e34147d1a6276a77d9fd26ac0f6a1 (diff)
parent08c3b4b7c3c384829f7f86ec2d8e7f3499942284 (diff)
downloadQt-48e08ee5718b3de855ecea626179ad5323e38fa0.zip
Qt-48e08ee5718b3de855ecea626179ad5323e38fa0.tar.gz
Qt-48e08ee5718b3de855ecea626179ad5323e38fa0.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Fix example in QAudioOutput/QAudioInput docs
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/audio/qaudioinput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp
index 6fc4284..da39c4a 100644
--- a/src/multimedia/audio/qaudioinput.cpp
+++ b/src/multimedia/audio/qaudioinput.cpp
@@ -103,7 +103,7 @@ QT_BEGIN_NAMESPACE
audio = new QAudioInput(format, this);
QTimer::singleShot(3000, this, SLOT(stopRecording()));
- audio->start(outputFile);
+ audio->start(&outputFile);
// Records audio for 3000ms
}
\endcode