From: Jørgen Lind <jorgen.lind@nokia.com>
Date: Tue, 15 Mar 2011 12:54:08 +0000 (+0100)
Subject: Make configuration of Qt-Compositor easier to understand
X-Git-Tag: qt-v5.0.0-alpha1~360
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca55e389672f8493d359cee6c2b5bd2f80cccf0b;p=profile%2Fivi%2Fqtwayland.git

Make configuration of Qt-Compositor easier to understand
---

diff --git a/src/qt-compositor/qt-compositor.pri b/src/qt-compositor/qt-compositor.pri
index 1ec6c23..2f9914e 100644
--- a/src/qt-compositor/qt-compositor.pri
+++ b/src/qt-compositor/qt-compositor.pri
@@ -2,25 +2,27 @@ LIBS += -lwayland-server -lffi
 INCLUDEPATH += $$PWD
 
 wayland_gl {
+    system(echo "Qt-Compositor configured with openGL")
     QT += opengl
     DEFINES += QT_COMPOSITOR_WAYLAND_GL
-}
-
-mesa_egl {
-include (mesa_egl/mesa_egl.pri)
-DEFINES += QT_COMPOSITOR_MESA_EGL
-}
-
-dri2_xcb {
-include (dri2_xcb/dri2_xcb.pri)
-DEFINES += QT_COMPOSITOR_DRI2_XCB
-}
-
-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)
+    mesa_egl {
+        include (mesa_egl/mesa_egl.pri)
+        DEFINES += QT_COMPOSITOR_MESA_EGL
+    }
+
+    dri2_xcb {
+        include (dri2_xcb/dri2_xcb.pri)
+        DEFINES += QT_COMPOSITOR_DRI2_XCB
+    }
+
+    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")
 }
 
 SOURCES += $$PWD/qtcompositor.cpp \