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/qwindow-compositor/qwindow-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/qwindow-compositor/qwindow-compositor.pro')
-rw-r--r-- | examples/wayland/qwindow-compositor/qwindow-compositor.pro | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/examples/wayland/qwindow-compositor/qwindow-compositor.pro b/examples/wayland/qwindow-compositor/qwindow-compositor.pro index 4bab000b5..994276d99 100644 --- a/examples/wayland/qwindow-compositor/qwindow-compositor.pro +++ b/examples/wayland/qwindow-compositor/qwindow-compositor.pro @@ -1,25 +1,18 @@ -QT += gui gui-private core-private compositor +QT += gui gui-private core-private waylandcompositor waylandcompositor-private LIBS += -L ../../lib -#include (../../src/qt-compositor/qt-compositor.pri) HEADERS += \ compositorwindow.h \ - qwindowcompositor.h \ - textureblitter.h + windowcompositor.h SOURCES += main.cpp \ compositorwindow.cpp \ - qwindowcompositor.cpp \ - textureblitter.cpp + windowcompositor.cpp -# to make QtCompositor/... style includes working without installing +# to make QtWaylandCompositor/... style includes working without installing INCLUDEPATH += $$PWD/../../include -# if you want to compile QtCompositor as part of the application -# instead of linking to it, remove the QT += compositor and uncomment -# the following line -#include(../../src/compositor/compositor.pri) RESOURCES += qwindow-compositor.qrc |