projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
22e3111
)
Fix: Do not require GL library if configured with -no-opengl
author
aavit
<eirik.aavitsland@digia.com>
Wed, 5 Dec 2012 14:32:00 +0000
(15:32 +0100)
committer
The Qt Project
<gerrit-noreply@qt-project.org>
Thu, 6 Dec 2012 11:49:02 +0000
(12:49 +0100)
qt_lib_gui.pri would add an unneeded -lGL, causing the build to fail
on systems with no GL libraries.
Change-Id: I3a49418e1393642e9d97999b79741cc2144a99af
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
src/gui/gui.pro
patch
|
blob
|
history
diff --git
a/src/gui/gui.pro
b/src/gui/gui.pro
index
301d704
..
5f94426
100644
(file)
--- a/
src/gui/gui.pro
+++ b/
src/gui/gui.pro
@@
-1,6
+1,6
@@
TARGET = QtGui
QT = core-private
-MODULE_CONFIG = opengl
+
contains(QT_CONFIG, opengl.*):
MODULE_CONFIG = opengl
DEFINES += QT_NO_USING_NAMESPACE