diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-02-14 11:57:46 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-14 13:24:53 +0100 |
commit | fc62718e983c945f013ebfd92b77155b38a04087 (patch) | |
tree | 6b2c607b1c3c4fd18d9684ea677cc661e0c8d322 | |
parent | 21552ae9aad619b87f51b86918bb46f6ced62af1 (diff) |
Fix MinGW64-warnings about unknown pragmas.
Change-Id: I1bd2178f5986846aede371193e98b55e4bde6414
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
-rw-r--r-- | src/plugins/directshow/camera/dscamerasession.h | 10 | ||||
-rw-r--r-- | src/plugins/directshow/dsserviceplugin.cpp | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.h b/src/plugins/directshow/camera/dscamerasession.h index c02a99098..4a659196d 100644 --- a/src/plugins/directshow/camera/dscamerasession.h +++ b/src/plugins/directshow/camera/dscamerasession.h @@ -56,11 +56,15 @@ #include <dshow.h> #include <objbase.h> #include <initguid.h> -#pragma comment(lib, "strmiids.lib") -#pragma comment(lib, "ole32.lib") +#ifdef Q_CC_MSVC +# pragma comment(lib, "strmiids.lib") +# pragma comment(lib, "ole32.lib") +#endif // Q_CC_MSVC #include <windows.h> -#pragma include_alias("dxtrans.h","qedit.h") +#ifdef Q_CC_MSVC +# pragma include_alias("dxtrans.h","qedit.h") +#endif // Q_CC_MSVC #define __IDxtCompositor_INTERFACE_DEFINED__ #define __IDxtAlphaSetter_INTERFACE_DEFINED__ #define __IDxtJpeg_INTERFACE_DEFINED__ diff --git a/src/plugins/directshow/dsserviceplugin.cpp b/src/plugins/directshow/dsserviceplugin.cpp index 2ac828bd1..32e6a6e3b 100644 --- a/src/plugins/directshow/dsserviceplugin.cpp +++ b/src/plugins/directshow/dsserviceplugin.cpp @@ -69,8 +69,10 @@ extern const CLSID CLSID_VideoInputDeviceCategory; #include <dshow.h> #include <objbase.h> #include <initguid.h> -#pragma comment(lib, "strmiids.lib") -#pragma comment(lib, "ole32.lib") +#ifdef Q_CC_MSVC +# pragma comment(lib, "strmiids.lib") +# pragma comment(lib, "ole32.lib") +#endif // Q_CC_MSVC #include <windows.h> #include <ocidl.h> #endif |