diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:40:51 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:41:00 +0100 |
| commit | a5947906d3aac7ec2f21a9621f7ad67a761a4560 (patch) | |
| tree | b67a28ecfdf01a0ca71ec51e00ee45ee1491eeaf /src/multimedia/controls/qmediastreamscontrol.h | |
| parent | 962e99534d8955ae6c3c3524c5005f518b4e01bc (diff) | |
| parent | 79f585b9e90c311f2c7b905426318d345b1bf641 (diff) | |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtmultimedia into newdocs
Change-Id: Idb607da32f80784d94556443be6740c6d7223411
Diffstat (limited to 'src/multimedia/controls/qmediastreamscontrol.h')
| -rw-r--r-- | src/multimedia/controls/qmediastreamscontrol.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index 33ab358a6..a1b0f2855 100644 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ b/src/multimedia/controls/qmediastreamscontrol.h @@ -52,8 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Multimedia) - // Required for QDoc workaround class QString; |