diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-05-08 11:34:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-15 12:43:08 +0200 |
| commit | b604d96ba8cb4b20f3a27537c591a7777e485d0e (patch) | |
| tree | 8e636cca1eb1b8436dd03d96b1e4634d324a24b1 /config.tests/directshow/main.cpp | |
| parent | f4348fe3ae91ac47f45495681738505ff6005453 (diff) | |
Make directshow-plugin available.
No longer include <qedit.h> in directshow-plugin,
which no longer ships in newer SDKs.
Ensure it only provides the camera service if the
WMF-plugin is built by using a different .json-file.
Adapt qcamerabackend-test to use widgets.
Task-number: QTBUG-28047
Change-Id: I22ea441b9edb56ff55bc275dba37c01c77d8dd90
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'config.tests/directshow/main.cpp')
| -rw-r--r-- | config.tests/directshow/main.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/config.tests/directshow/main.cpp b/config.tests/directshow/main.cpp index 6611741db..55e2e80ae 100644 --- a/config.tests/directshow/main.cpp +++ b/config.tests/directshow/main.cpp @@ -43,13 +43,6 @@ #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**) { return 0; |