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/plugins/directshow/camera/dsvideowidgetcontrol.h | |
parent | 697abcc532805fa1d10d56256a5f387fbad8c11b (diff) | |
parent | 954bb7b9603e6049ef3b22ddd5fad2b324d937c3 (diff) | |
download | qtmultimedia-fa8ee64dd6c20ba6f18a70084ddac16655895df4.tar.gz |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I0f78796735fc37e092b6747bdc89cc0f41164472
Diffstat (limited to 'src/plugins/directshow/camera/dsvideowidgetcontrol.h')
-rw-r--r-- | src/plugins/directshow/camera/dsvideowidgetcontrol.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.h b/src/plugins/directshow/camera/dsvideowidgetcontrol.h index aced707fa..ac40fbd7c 100644 --- a/src/plugins/directshow/camera/dsvideowidgetcontrol.h +++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.h @@ -51,8 +51,6 @@ #include <qvideowidgetcontrol.h> #include "dscameracontrol.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DSVideoWidgetSurface : public QAbstractVideoSurface @@ -149,6 +147,4 @@ private: // Data QT_END_NAMESPACE -QT_END_HEADER - #endif // DSVideoWidgetControl_H |