diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-22 06:49:43 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-22 06:49:43 (GMT) |
| commit | 77b8039e9ec0e6ef90e26a1e9aaa8e76018c35b5 (patch) | |
| tree | 04838b1148671dedac1a981c872b226a170fe328 | |
| parent | 8cec21a14fdc53f3dd147eaf7a807c7b77a2f766 (diff) | |
| parent | 155ae1da9dcf11617f412e5c229a2a12a333d7db (diff) | |
| download | Qt-77b8039e9ec0e6ef90e26a1e9aaa8e76018c35b5.zip Qt-77b8039e9ec0e6ef90e26a1e9aaa8e76018c35b5.tar.gz Qt-77b8039e9ec0e6ef90e26a1e9aaa8e76018c35b5.tar.bz2 | |
Merge remote branch 'origin/master' into integration-master-from-4.6
| -rw-r--r-- | src/multimedia/qml/qsoundeffect_pulse_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/qml/qsoundeffect_pulse_p.cpp b/src/multimedia/qml/qsoundeffect_pulse_p.cpp index b1e5982..7057022 100644 --- a/src/multimedia/qml/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/qml/qsoundeffect_pulse_p.cpp @@ -362,7 +362,7 @@ void QSoundEffectPrivate::decoderReady() } if (m_name.isNull()) - m_name = QString(QLatin1String("QtPulseSample-%1-%2")).arg(::getpid()).arg(int(this)).toUtf8(); + m_name = QString(QLatin1String("QtPulseSample-%1-%2")).arg(::getpid()).arg(quintptr(this)).toUtf8(); pa_sample_spec spec = audioFormatToSampleSpec(m_waveDecoder->audioFormat()); |