diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 01:40:56 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 01:40:56 (GMT) |
commit | a2427d2d9355e72a667ec2fd1a4cc018df43ec86 (patch) | |
tree | d966f4f405adb7eb054b1b6e80c3b126d9e9af5e /src | |
parent | bd90a38b851e47ccc922838a71a5631437e5b43c (diff) | |
parent | 83e73a69d5a1c6b94c5c83f91141f35d65d27f36 (diff) | |
download | Qt-a2427d2d9355e72a667ec2fd1a4cc018df43ec86.zip Qt-a2427d2d9355e72a667ec2fd1a4cc018df43ec86.tar.gz Qt-a2427d2d9355e72a667ec2fd1a4cc018df43ec86.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed invokeMethod in alsa implementation.
Diffstat (limited to 'src')
-rw-r--r-- | src/multimedia/audio/qaudiooutput_alsa_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp index e49c75a..7eb38b6 100644 --- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp +++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp @@ -648,7 +648,7 @@ void QAudioOutputPrivate::userFeed() void QAudioOutputPrivate::feedback() { - QMetaObject::invokeMethod(this, SLOT(updateAvailable()), Qt::QueuedConnection); + QMetaObject::invokeMethod(this, "updateAvailable", Qt::QueuedConnection); } void QAudioOutputPrivate::updateAvailable() |