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

Fix MinGW64-warnings about unknown pragmas.

Browse Source 
Change-Id: I1bd2178f5986846aede371193e98b55e4bde6414
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Friedemann Kleint
2013-02-14 11:57:46 +01:00
committed by The Qt Project
parent 21552ae9aa
commit fc62718e98
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/directshow/camera/dscamerasession.h
View File

@@ -56,11 +56,15 @@
#include <dshow.h> #include <dshow.h>
#include <objbase.h> #include <objbase.h>
#include <initguid.h> #include <initguid.h>
#ifdef Q_CC_MSVC
# pragma comment(lib, "strmiids.lib") # pragma comment(lib, "strmiids.lib")
# pragma comment(lib, "ole32.lib") # pragma comment(lib, "ole32.lib")
#endif // Q_CC_MSVC
#include <windows.h> #include <windows.h>
#ifdef Q_CC_MSVC
# pragma include_alias("dxtrans.h","qedit.h") # pragma include_alias("dxtrans.h","qedit.h")
#endif // Q_CC_MSVC
#define __IDxtCompositor_INTERFACE_DEFINED__ #define __IDxtCompositor_INTERFACE_DEFINED__
#define __IDxtAlphaSetter_INTERFACE_DEFINED__ #define __IDxtAlphaSetter_INTERFACE_DEFINED__
#define __IDxtJpeg_INTERFACE_DEFINED__ #define __IDxtJpeg_INTERFACE_DEFINED__

2
src/plugins/directshow/dsserviceplugin.cpp
View File

@@ -69,8 +69,10 @@ extern const CLSID CLSID_VideoInputDeviceCategory;
#include <dshow.h> #include <dshow.h>
#include <objbase.h> #include <objbase.h>
#include <initguid.h> #include <initguid.h>
#ifdef Q_CC_MSVC
# pragma comment(lib, "strmiids.lib") # pragma comment(lib, "strmiids.lib")
# pragma comment(lib, "ole32.lib") # pragma comment(lib, "ole32.lib")
#endif // Q_CC_MSVC
#include <windows.h> #include <windows.h>
#include <ocidl.h> #include <ocidl.h>
#endif #endif