diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 14:00:44 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 14:01:08 +0100 |
| commit | 05bf419b206f3cd078364cf67af2df4e4d1477c0 (patch) | |
| tree | c942e884e8f75a29bd9f281c993fbc85a0b832ed /examples/wayland/server-buffer/compositor/compositor.pro | |
| parent | dd5e1ffd3e9e379574325193c8546d453c11303e (diff) | |
| parent | 3698b116a1973146b76319673cdb6787f13f2de6 (diff) | |
Merge branch 'wip-compositor-api' into dev
This introduces the new compositor API, removing the
old API (which was never officially supported).
Change-Id: I1dc01f0fb4edc749e34ed8356e56ad87d7d64913
Diffstat (limited to 'examples/wayland/server-buffer/compositor/compositor.pro')
| -rw-r--r-- | examples/wayland/server-buffer/compositor/compositor.pro | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/examples/wayland/server-buffer/compositor/compositor.pro b/examples/wayland/server-buffer/compositor/compositor.pro index 8d7f48820..f391d3a1b 100644 --- a/examples/wayland/server-buffer/compositor/compositor.pro +++ b/examples/wayland/server-buffer/compositor/compositor.pro @@ -1,20 +1,23 @@ -QT += core-private gui-private quick-private compositor-private +QT += core-private gui-private quick-private waylandcompositor-private -LIBS += -lwayland-server +contains(QT_CONFIG, no-pkg-config) { + LIBS += -lwayland-server +} else { + CONFIG += link_pkgconfig + PKGCONFIG += wayland-server +} SOURCES += \ main.cpp \ serverbufferitem.cpp + HEADERS += \ - serverbufferitem.h \ + serverbufferitem.h OTHER_FILES = \ - qml/main.qml \ - images/background.jpg \ + images/background.jpg RESOURCES += compositor.qrc -CONFIG +=wayland-scanner +CONFIG += wayland-scanner WAYLANDSERVERSOURCES += ../share-buffer.xml - -DEFINES += QT_COMPOSITOR_QUICK |