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 | |
parent | 762d384b806deb84072a5c7eb6b91afa1e150c1f (diff) | |
download | qtwayland-00fba62ce3e5bd00ba5e8ab6f5b7a71bdb93c6a1.tar.gz |
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')
11 files changed, 33 insertions, 37 deletions
diff --git a/examples/wayland/multi-output/multi-output.pro b/examples/wayland/multi-output/multi-output.pro index ed9545d4..7416cdb2 100644 --- a/examples/wayland/multi-output/multi-output.pro +++ b/examples/wayland/multi-output/multi-output.pro @@ -1,4 +1,4 @@ -QT += core-private gui-private quick-private compositor-private +QT += core-private gui-private quick-private SOURCES += \ main.cpp diff --git a/examples/wayland/pure-qml/pure-qml.pro b/examples/wayland/pure-qml/pure-qml.pro index 55b5568b..02bf68b9 100644 --- a/examples/wayland/pure-qml/pure-qml.pro +++ b/examples/wayland/pure-qml/pure-qml.pro @@ -1,4 +1,4 @@ -QT += core-private gui-private quick-private compositor-private +QT += core-private gui-private quick-private SOURCES += \ main.cpp diff --git a/examples/wayland/qml-compositor/main.cpp b/examples/wayland/qml-compositor/main.cpp index a01183bb..b58c4603 100644 --- a/examples/wayland/qml-compositor/main.cpp +++ b/examples/wayland/qml-compositor/main.cpp @@ -42,9 +42,9 @@ #include "qwaylandquickcompositor.h" #include "qwaylandquicksurface.h" -#include <QtCompositor/qwaylandquickitem.h> -#include <QtCompositor/QWaylandQuickOutput> -#include <QtCompositor/qwaylandoutputspace.h> +#include <QtWaylandCompositor/qwaylandquickitem.h> +#include <QtWaylandCompositor/QWaylandQuickOutput> +#include <QtWaylandCompositor/qwaylandoutputspace.h> #include <QGuiApplication> #include <QTimer> diff --git a/examples/wayland/qml-compositor/qml-compositor.pro b/examples/wayland/qml-compositor/qml-compositor.pro index f908a2f2..e66630e7 100644 --- a/examples/wayland/qml-compositor/qml-compositor.pro +++ b/examples/wayland/qml-compositor/qml-compositor.pro @@ -5,10 +5,10 @@ LIBS += -L ../../lib QT += quick qml QT += quick-private -QT += compositor +QT += waylandcompositor # 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/qwindow-compositor.pro b/examples/wayland/qwindow-compositor/qwindow-compositor.pro index c630b8c3..a924cfd6 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 9f9a8e06..c8502ec8 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 9e1eb080..30ee3323 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" diff --git a/examples/wayland/server-buffer/compositor/compositor.pro b/examples/wayland/server-buffer/compositor/compositor.pro index 9f7751a0..a01b6fae 100644 --- a/examples/wayland/server-buffer/compositor/compositor.pro +++ b/examples/wayland/server-buffer/compositor/compositor.pro @@ -1,4 +1,4 @@ -QT += core-private gui-private quick-private compositor-private +QT += core-private gui-private quick-private waylandcompositor-private LIBS += -lwayland-server diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp index ecec5c8c..29f83959 100644 --- a/examples/wayland/server-buffer/compositor/main.cpp +++ b/examples/wayland/server-buffer/compositor/main.cpp @@ -56,11 +56,11 @@ #include <QQuickView> #include "qwayland-server-share-buffer.h" -#include <QtCompositor/QWaylandQuickOutput> -#include <QtCompositor/QWaylandCompositor> -#include <QtCompositor/QWaylandQuickItem> -#include <QtCompositor/private/qwaylandcompositor_p.h> -#include <QtCompositor/private/qwlserverbufferintegration_p.h> +#include <QtWaylandCompositor/QWaylandQuickOutput> +#include <QtWaylandCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/QWaylandQuickItem> +#include <QtWaylandCompositor/private/qwaylandcompositor_p.h> +#include <QtWaylandCompositor/private/qwlserverbufferintegration_p.h> #include "serverbufferitem.h" diff --git a/examples/wayland/server-buffer/compositor/serverbufferitem.cpp b/examples/wayland/server-buffer/compositor/serverbufferitem.cpp index 96ceed0a..4cf5f71f 100644 --- a/examples/wayland/server-buffer/compositor/serverbufferitem.cpp +++ b/examples/wayland/server-buffer/compositor/serverbufferitem.cpp @@ -45,7 +45,7 @@ #include <QtQuick/QSGSimpleTextureNode> #include <QtQuick/QQuickWindow> -#include <QtCompositor/private/qwlserverbufferintegration_p.h> +#include <QtWaylandCompositor/private/qwlserverbufferintegration_p.h> QT_BEGIN_NAMESPACE diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro index 6b9272fc..29c9fff6 100644 --- a/examples/wayland/wayland.pro +++ b/examples/wayland/wayland.pro @@ -1,14 +1,10 @@ TEMPLATE=subdirs -#Only build compositor examples if we are building -#the QtCompositor API -contains(CONFIG, wayland-compositor) { - SUBDIRS += qwindow-compositor +SUBDIRS += qwindow-compositor - qtHaveModule(quick) { - SUBDIRS += qml-compositor - } - - SUBDIRS += server-buffer - SUBDIRS += pure-qml +qtHaveModule(quick) { + SUBDIRS += qml-compositor } + +SUBDIRS += server-buffer +SUBDIRS += pure-qml |