slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed directshow config test

Browse Source 
In some versions of Microsoft Windows SDK v6.0A, the qedit.h header is
present, but dxtrans.h (which is #included by qedit.h) is missing.

The standard workaround for this issue is already used by
plugins/multimedia/directshow/camera/dscamerasession.h; this commit adds
the same workaround to the config test.

Reviewed-by: Michael Goddard
Reviewed-by: Ling Hu
(cherry picked from commit e3c07dc9dd6a9f7930ca3c61cfd667d816731ce1)

Change-Id: Ia53c4f6b3efc86e2447a39e6d95e7f67d7e46b5d
Reviewed-on: http://codereview.qt-project.org/5498
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Gareth Stockwell
2011-08-01 11:17:29 +01:00
committed by Qt by Nokia
parent 8c29d67e67
commit 9cb61ab778
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.tests/directshow/main.cpp
View File

@@ -42,6 +42,12 @@
#include <dshow.h> #include <dshow.h>
#include <d3d9.h> #include <d3d9.h>
#include <vmr9.h> #include <vmr9.h>
#pragma include_alias("dxtrans.h","qedit.h")
#define __IDxtCompositor_INTERFACE_DEFINED__
#define __IDxtAlphaSetter_INTERFACE_DEFINED__
#define __IDxtJpeg_INTERFACE_DEFINED__
#define __IDxtKey_INTERFACE_DEFINED__
#include <qedit.h> #include <qedit.h>
int main(int, char**) int main(int, char**)