Merge remote-tracking branch 'origin/5.4.1' into 5.4

Change-Id: I4167d268505cbc0b7b57888928670ae05302f4cb
2015-02-10 10:34:52 +01:00
parent d60347eb83 6b6cb2121f
commit 9e93612890
2 changed files with 50 additions and 1 deletions
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -1,5 +1,5 @@
 TARGET = dsengine
-win32:!qtHaveModule(opengl) {
+win32:!qtHaveModule(opengl)|contains(QT_CONFIG,dynamicgl) {
    LIBS_PRIVATE += -lgdi32 -luser32
 }
 PLUGIN_TYPE=mediaservice