From 9cb61ab778d642346dff714381d4a804c68e3f1f Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Mon, 1 Aug 2011 11:17:29 +0100
Subject: 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>
---
 config.tests/directshow/main.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'config.tests')

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**)
-- 
cgit v1.2.3