diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:34:52 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:34:52 +0100 |
| commit | 9e936128904625613e0e73fbbd8fc6a48c10e0bd (patch) | |
| tree | 94aeafebe2754c3de406ef9a77f63aa75c99c8e3 /src | |
| parent | d60347eb836d6f9063c8133495e52c8c6c2590c3 (diff) | |
| parent | 6b6cb2121f1ec56ba710a9b57ace3ee74aebe4f1 (diff) | |
Merge remote-tracking branch 'origin/5.4.1' into 5.4
Change-Id: I4167d268505cbc0b7b57888928670ae05302f4cb
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/directshow/directshow.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 5b59ccfe0..7815927db 100644 --- 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 |