projects
/
platform
/
upstream
/
qtmultimedia.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
db7f7cc
)
Fix linking problem when built with -no-opengl
author
Andy Shaw
<andy.shaw@digia.com>
Mon, 10 Feb 2014 23:24:58 +0000
(
00:24
+0100)
committer
The Qt Project
<gerrit-noreply@qt-project.org>
Mon, 17 Feb 2014 18:03:38 +0000
(19:03 +0100)
When -no-opengl was used then it was not automatically pulling in the
needed Windows libraries as it was not loading opengl.prf to get them
from.
Change-Id: I9b73e5ee01da964a64c71b6261ff4ed98ce6f1a9
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
src/plugins/wmf/wmf.pro
patch
|
blob
|
history
diff --git
a/src/plugins/wmf/wmf.pro
b/src/plugins/wmf/wmf.pro
index
a26f319
..
b1d157a
100644
(file)
--- a/
src/plugins/wmf/wmf.pro
+++ b/
src/plugins/wmf/wmf.pro
@@
-4,6
+4,9
@@
qtHaveModule(widgets) {
QT += multimediawidgets-private
DEFINES += HAVE_WIDGETS
}
+win32:!qtHaveModule(opengl) {
+ LIBS_PRIVATE += -lgdi32 -luser32
+}
PLUGIN_TYPE=mediaservice
PLUGIN_CLASS_NAME = WMFServicePlugin