Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4

2015-02-10 21:28:00 +00:00
parent b1a2b3f55e 9e93612890
commit 13b24ab18b
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