diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2011-08-01 11:17:29 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-26 07:21:50 +0200 |
| commit | 9cb61ab778d642346dff714381d4a804c68e3f1f (patch) | |
| tree | 0ffe10899e838e5699db651d5577d7341c5457a3 /config.tests | |
| parent | 8c29d67e67beb4b3812b8378087d4bb830365211 (diff) | |
Fixed directshow config test
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>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/directshow/main.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config.tests/directshow/main.cpp b/config.tests/directshow/main.cpp index 972a57c10..3ebd7ac14 100644 --- a/config.tests/directshow/main.cpp +++ b/config.tests/directshow/main.cpp @@ -42,6 +42,12 @@ #include <dshow.h> #include <d3d9.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> int main(int, char**) |