projects
/
profile
/
ivi
/
qtwayland.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2882958
)
Remove glesv2 pkg-config config. We should pick this up
author
Jørgen Lind
<jorgen.lind@nokia.com>
Wed, 6 Apr 2011 10:55:29 +0000
(12:55 +0200)
committer
Jørgen Lind
<jorgen.lind@nokia.com>
Wed, 6 Apr 2011 10:56:16 +0000
(12:56 +0200)
with QtOpenGL
src/qt-compositor/qt-compositor.pri
patch
|
blob
|
history
diff --git
a/src/qt-compositor/qt-compositor.pri
b/src/qt-compositor/qt-compositor.pri
index
6100bbd
..
048a458
100644
(file)
--- a/
src/qt-compositor/qt-compositor.pri
+++ b/
src/qt-compositor/qt-compositor.pri
@@
-20,12
+20,6
@@
wayland_gl {
system(echo "Qt-Compositor configured with openGL")
QT += opengl
DEFINES += QT_COMPOSITOR_WAYLAND_GL
- use_pkgconfig {
- QMAKE_CXXFLAGS += $$system(pkg-config --cflags glesv2)
- #for some reason this is not included in the cflags line
- INCLUDEPATH += $$system(pkg-config --variable=includedir glesv2)
- LIBS += $$system(pkg-config --libs glesv2)
- }
} else {
system(echo "Qt-Compositor configured as raster only compositor")
}