diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-27 09:24:10 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-27 09:24:10 +0200 |
| commit | 83f0038fa7fd090840fdd19fd30652bd7bbb6fd3 (patch) | |
| tree | 967073fc2b030b1e6c269d45d2c6dd8b703456d7 /src/plugins/directshow | |
| parent | 3ce4b38a7c6711ea378a56baec84b73da55a9c84 (diff) | |
| parent | 5edb1597cf71cebbffb3d05f975cf55702c53abd (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0
Change-Id: I6df92f98db7c18dcecdc831d46748d8111dffacb
Diffstat (limited to 'src/plugins/directshow')
| -rw-r--r-- | src/plugins/directshow/player/directshowmetadatacontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp index 46674143e..d9864870a 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp +++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp @@ -64,7 +64,7 @@ #endif #if QT_CONFIG(wshellitem) -#include <ShlObj.h> +#include <shlobj.h> #include <propkeydef.h> #include <private/qsystemlibrary_p.h> |