Create new examples directory for the example compositor.

Moving the example compositor makes the separation between the
compositor interface and the example implementation explicit.

diff --git a/src/qt-compositor/main.cpp b/examples/qwidget-compositor/main.cpp
similarity index 100%
rename from src/qt-compositor/main.cpp
rename to examples/qwidget-compositor/main.cpp

diff --git a/src/qt-compositor/qt-compositor.pro b/examples/qwidget-compositor/qt-compositor.pro
similarity index 75%
rename from src/qt-compositor/qt-compositor.pro
rename to examples/qwidget-compositor/qt-compositor.pro
index bc172a9..0d32e75 100644 (file)
--- a/src/qt-compositor/qt-compositor.pro
+++ b/examples/qwidget-compositor/qt-compositor.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = qt-compositor
 DEPENDPATH += .
 INCLUDEPATH += .
-INCLUDEPATH += ../3rdparty/wayland
+INCLUDEPATH += ../../src/qt-compositor/
 
 # comment out the following line to disable DRM
 CONFIG += wayland_drm
@@ -11,10 +11,7 @@ DESTDIR=$$PWD/../../bin/
 
 LIBS += -L ../../lib
 
-wayland_drm  {
-  LIBS += -lxcb-dri2 -lEGL
-}
-include (qt-compositor.pri)
+include (../../src/qt-compositor/qt-compositor.pri)
 
 # Input
 SOURCES += main.cpp

diff --git a/src/qt-compositor/qt-compositor.pri b/src/qt-compositor/qt-compositor.pri
index 91d1e07..facddda 100644 (file)
--- a/src/qt-compositor/qt-compositor.pri
+++ b/src/qt-compositor/qt-compositor.pri
@@ -21,9 +21,12 @@ HEADERS += $$PWD/qtcompositor.h \
         $$PWD/wldisplay.h \
         $$PWD/wlobject.h
 
+INCLUDEPATH += $$PWD/../3rdparty/wayland
+
 wayland_drm  {
   SOURCES += $$PWD/wldrmbuffer.cpp
   HEADERS +=  $$PWD/wldrmbuffer.h
 
   DEFINES += QT_WAYLAND_DRM
+  LIBS += -lxcb-dri2 -lEGL
 }