From c8fbc1150a7c38af81d90e8ae6b7d9f450ba6325 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Wed, 9 Mar 2011 13:29:08 +0100
Subject: [PATCH] Fix not having "our own include paths in pri files"

Rev-by: paul
---
 examples/qwidget-compositor/qt-compositor.pro | 6 +++---
 src/qt-compositor/qt-compositor.pri           | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/examples/qwidget-compositor/qt-compositor.pro b/examples/qwidget-compositor/qt-compositor.pro
index 41776f8..8e3e586 100644
--- a/examples/qwidget-compositor/qt-compositor.pro
+++ b/examples/qwidget-compositor/qt-compositor.pro
@@ -8,15 +8,15 @@ INCLUDEPATH += ../../src/qt-compositor/
 CONFIG += wayland_gl
 CONFIG += mesa_egl
 
+# comment out the following to not use pkg-config in the pri files
+CONFIG += use_pkgconfig
+
 DESTDIR=$$PWD/../../bin/
 
 LIBS += -L ../../lib
 
 include (../../src/qt-compositor/qt-compositor.pri)
 
-LIBS += -L/home/jlind/install/lib
-INCLUDEPATH += /home/jlind/install/include
-
 # Input
 SOURCES += main.cpp
 
diff --git a/src/qt-compositor/qt-compositor.pri b/src/qt-compositor/qt-compositor.pri
index 5296b72..7aa2a49 100644
--- a/src/qt-compositor/qt-compositor.pri
+++ b/src/qt-compositor/qt-compositor.pri
@@ -10,6 +10,13 @@ include (mesa_egl/mesa_egl.pri)
 DEFINES += QT_COMPOSITOR_MESA_EGL
 }
 
+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)
+}
+
 SOURCES += $$PWD/qtcompositor.cpp \
         $$PWD/graphicshardwareintegration.cpp \
         $$PWD/private/wlcompositor.cpp \
-- 
2.7.4