diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-07 14:04:17 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-10 08:20:53 +0000 |
| commit | 00fba62ce3e5bd00ba5e8ab6f5b7a71bdb93c6a1 (patch) | |
| tree | 1a135ec31593b76c38849621f1d4ecc5508266d8 /examples/wayland/qwindow-compositor | |
| parent | 762d384b806deb84072a5c7eb6b91afa1e150c1f (diff) | |
Rename QtCompositor to QtWaylandCompositor
enable building QtWaylandCompositor by default
Change-Id: I7cf34052b304ca9fef55b7e30ef6a6367b5d75f1
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'examples/wayland/qwindow-compositor')
3 files changed, 13 insertions, 13 deletions
diff --git a/examples/wayland/qwindow-compositor/qwindow-compositor.pro b/examples/wayland/qwindow-compositor/qwindow-compositor.pro index c630b8c39..a924cfd6a 100644 --- a/examples/wayland/qwindow-compositor/qwindow-compositor.pro +++ b/examples/wayland/qwindow-compositor/qwindow-compositor.pro @@ -1,4 +1,4 @@ -QT += gui gui-private core-private compositor compositor-private +QT += gui gui-private core-private waylandcompositor waylandcompositor-private LIBS += -L ../../lib #include (../../src/qt-compositor/qt-compositor.pri) @@ -17,7 +17,7 @@ SOURCES += main.cpp \ 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 +# instead of linking to it, remove the QT += waylandcompositor and uncomment # the following line #include(../../src/compositor/compositor.pri) diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp index 9f9a8e060..c8502ec86 100644 --- a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp +++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp @@ -53,14 +53,14 @@ #include <QScreen> #include <QPainter> -#include <QtCompositor/qwaylandinput.h> -#include <QtCompositor/qwaylandbufferref.h> -#include <QtCompositor/qwaylandview.h> -#include <QtCompositor/qwaylandoutput.h> -#include <QtCompositor/qwaylandoutputspace.h> - -#include <QtCompositor/QWaylandShellSurface> -#include <QtCompositor/private/qwlextendedsurface_p.h> +#include <QtWaylandCompositor/qwaylandinput.h> +#include <QtWaylandCompositor/qwaylandbufferref.h> +#include <QtWaylandCompositor/qwaylandview.h> +#include <QtWaylandCompositor/qwaylandoutput.h> +#include <QtWaylandCompositor/qwaylandoutputspace.h> + +#include <QtWaylandCompositor/QWaylandShellSurface> +#include <QtWaylandCompositor/private/qwlextendedsurface_p.h> QT_BEGIN_NAMESPACE diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.h b/examples/wayland/qwindow-compositor/qwindowcompositor.h index 9e1eb0801..30ee33238 100644 --- a/examples/wayland/qwindow-compositor/qwindowcompositor.h +++ b/examples/wayland/qwindow-compositor/qwindowcompositor.h @@ -41,9 +41,9 @@ #ifndef QWINDOWCOMPOSITOR_H #define QWINDOWCOMPOSITOR_H -#include <QtCompositor/QWaylandCompositor> -#include <QtCompositor/QWaylandSurface> -#include <QtCompositor/QWaylandView> +#include <QtWaylandCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/QWaylandSurface> +#include <QtWaylandCompositor/QWaylandView> #include "textureblitter.h" #include "compositorwindow.h" |