diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-01 08:17:32 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-01 08:17:32 (GMT) |
| commit | b5b9faa7cdc877f8ab32a8d5ae480b5857761409 (patch) | |
| tree | 0d09f4e554aa01da3714cdc96af707a49b44ed93 /src/multimedia/audio/qaudioinput.cpp | |
| parent | 4f4f1e612488f400b2b139eaf7fea940fb6d7e7c (diff) | |
| parent | bc992c8e40fcfdcfe0015dd88dda77c318c10a55 (diff) | |
| download | Qt-b5b9faa7cdc877f8ab32a8d5ae480b5857761409.zip Qt-b5b9faa7cdc877f8ab32a8d5ae480b5857761409.tar.gz Qt-b5b9faa7cdc877f8ab32a8d5ae480b5857761409.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/multimedia/audio/qaudioinput.cpp')
| -rw-r--r-- | src/multimedia/audio/qaudioinput.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp index e794eaf..8b368d5 100644 --- a/src/multimedia/audio/qaudioinput.cpp +++ b/src/multimedia/audio/qaudioinput.cpp @@ -47,7 +47,6 @@ #include "qaudiodevicefactory_p.h" - QT_BEGIN_NAMESPACE /*! |