diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-25 10:51:44 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-25 10:51:44 +0200 |
| commit | 8cee5b06aa0ecde7ba0a53c8a46070af3691db1b (patch) | |
| tree | 4cd7f5ffb8b31af78f095c40fa6021a0331fde3b /src/multimedia | |
| parent | f729015e1f44065b1b1911b65ba3fddd35d5545b (diff) | |
| parent | f049061a7b479c957240ec8e4fd91d1e9463b071 (diff) | |
Merge commit 'origin/master' into 4.6
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/qaudio.h | 6 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceid.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h index bf5495c4b8..5b7ca3b7f5 100644 --- a/src/multimedia/audio/qaudio.h +++ b/src/multimedia/audio/qaudio.h @@ -64,8 +64,8 @@ QT_END_NAMESPACE QT_END_HEADER -Q_DECLARE_METATYPE(QAudio::Error); -Q_DECLARE_METATYPE(QAudio::State); -Q_DECLARE_METATYPE(QAudio::Mode); +Q_DECLARE_METATYPE(QAudio::Error) +Q_DECLARE_METATYPE(QAudio::State) +Q_DECLARE_METATYPE(QAudio::Mode) #endif // QAUDIO_H diff --git a/src/multimedia/audio/qaudiodeviceid.h b/src/multimedia/audio/qaudiodeviceid.h index 984283fd46..5d842fe1a6 100644 --- a/src/multimedia/audio/qaudiodeviceid.h +++ b/src/multimedia/audio/qaudiodeviceid.h @@ -88,7 +88,7 @@ QT_END_NAMESPACE QT_END_HEADER -Q_DECLARE_METATYPE(QAudioDeviceId); +Q_DECLARE_METATYPE(QAudioDeviceId) #endif // QAUDIODEVICEID_H |