diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-21 14:39:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-21 14:39:13 (GMT) |
| commit | d47900969aca5532a707d311965a69a1cf1ea5b1 (patch) | |
| tree | ba0e2971d12a8ba7bdee582767a3f0c0f0e5d2d1 | |
| parent | 2181a341839b72a627a7ef641de58d1d2411f123 (diff) | |
| parent | 46f7f9237affe5217ad6068f8b717128a5c62ecc (diff) | |
| download | Qt-d47900969aca5532a707d311965a69a1cf1ea5b1.zip Qt-d47900969aca5532a707d311965a69a1cf1ea5b1.tar.gz Qt-d47900969aca5532a707d311965a69a1cf1ea5b1.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()); |