diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:25:20 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-01 12:52:51 +0200 |
| commit | 659f238bbbe040cce1bdf900f8f5500845ca8727 (patch) | |
| tree | 7990072bf39b2c19df68bcd7615242d08eb8dd2f /config.tests/wmp/main.cpp | |
| parent | 80ba1d635dc37963b4c90d776c46774b0349c4f8 (diff) | |
| parent | 1dba07b602ef8b3fd9333a8afb1db4cbaf9d824e (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/gsttools/qgstreamervideoinputdevicecontrol.cpp
src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
Diffstat (limited to 'config.tests/wmp/main.cpp')
| -rw-r--r-- | config.tests/wmp/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config.tests/wmp/main.cpp b/config.tests/wmp/main.cpp index b06037ca0..0eb86cfe2 100644 --- a/config.tests/wmp/main.cpp +++ b/config.tests/wmp/main.cpp @@ -30,8 +30,11 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ - +#ifndef _WIN32_WCE #include <wmp.h> +#else +#include <wmpcore.h> +#endif int main(int, char**) { |