diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 01:12:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 01:12:24 (GMT) |
| commit | 155ae1da9dcf11617f412e5c229a2a12a333d7db (patch) | |
| tree | 7666d887785f0da1fbb0fe2d1dbe161b5e3fb775 | |
| parent | 0a83a6c571fadb454cb8711aed84258b061d44b5 (diff) | |
| parent | d47900969aca5532a707d311965a69a1cf1ea5b1 (diff) | |
| download | Qt-155ae1da9dcf11617f412e5c229a2a12a333d7db.zip Qt-155ae1da9dcf11617f412e5c229a2a12a333d7db.tar.gz Qt-155ae1da9dcf11617f412e5c229a2a12a333d7db.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.
| -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()); |