diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 14:26:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 14:26:22 +0100 |
| commit | e757890f4a5669b396039211902224f31666725a (patch) | |
| tree | bb220ff8b9d8d4a64ce5f197a4b39e3e5965da63 /src/plugins/directshow/player/directshowvideorenderercontrol.h | |
| parent | caf0cbca71231dbb6403108ba41d2117d3ce6c6d (diff) | |
| parent | 71a6b1b62041981f894cb2b6589fce92f137bbc4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672
Diffstat (limited to 'src/plugins/directshow/player/directshowvideorenderercontrol.h')
| -rw-r--r-- | src/plugins/directshow/player/directshowvideorenderercontrol.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/directshow/player/directshowvideorenderercontrol.h b/src/plugins/directshow/player/directshowvideorenderercontrol.h index 5082e6bd7..17dd4705b 100644 --- a/src/plugins/directshow/player/directshowvideorenderercontrol.h +++ b/src/plugins/directshow/player/directshowvideorenderercontrol.h @@ -40,10 +40,10 @@ #ifndef DIRECTSHOWVIDEORENDERERCONTROL_H #define DIRECTSHOWVIDEORENDERERCONTROL_H -#include "qvideorenderercontrol.h" - #include <dshow.h> +#include "qvideorenderercontrol.h" + class DirectShowEventLoop; QT_USE_NAMESPACE |