diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:55:03 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:55:42 +0100 |
| commit | fa8ee64dd6c20ba6f18a70084ddac16655895df4 (patch) | |
| tree | abfe07c1537f0e4ff15fde30ca4135377948c21c /src/multimedia/audio/qaudiooutput.h | |
| parent | 697abcc532805fa1d10d56256a5f387fbad8c11b (diff) | |
| parent | 954bb7b9603e6049ef3b22ddd5fad2b324d937c3 (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I0f78796735fc37e092b6747bdc89cc0f41164472
Diffstat (limited to 'src/multimedia/audio/qaudiooutput.h')
| -rw-r--r-- | src/multimedia/audio/qaudiooutput.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h index 0991896be..010192f1c 100644 --- a/src/multimedia/audio/qaudiooutput.h +++ b/src/multimedia/audio/qaudiooutput.h @@ -53,8 +53,6 @@ #include <QtMultimedia/qaudiodeviceinfo.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -113,6 +111,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIOOUTPUT_H |