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 /src/compositor/wayland_wrapper | |
| 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 'src/compositor/wayland_wrapper')
10 files changed, 20 insertions, 20 deletions
diff --git a/src/compositor/wayland_wrapper/qwldatadevice.cpp b/src/compositor/wayland_wrapper/qwldatadevice.cpp index 59f6dabbb..4c32538e6 100644 --- a/src/compositor/wayland_wrapper/qwldatadevice.cpp +++ b/src/compositor/wayland_wrapper/qwldatadevice.cpp @@ -43,10 +43,10 @@ #include "qwaylanddrag.h" #include "qwaylandview.h" -#include <QtCompositor/QWaylandClient> -#include <QtCompositor/private/qwaylandcompositor_p.h> -#include <QtCompositor/private/qwaylandinput_p.h> -#include <QtCompositor/private/qwaylandpointer_p.h> +#include <QtWaylandCompositor/QWaylandClient> +#include <QtWaylandCompositor/private/qwaylandcompositor_p.h> +#include <QtWaylandCompositor/private/qwaylandinput_p.h> +#include <QtWaylandCompositor/private/qwaylandpointer_p.h> #include <QtCore/QPointF> #include <QDebug> diff --git a/src/compositor/wayland_wrapper/qwldatadevice_p.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h index dc8c3be20..11946df59 100644 --- a/src/compositor/wayland_wrapper/qwldatadevice_p.h +++ b/src/compositor/wayland_wrapper/qwldatadevice_p.h @@ -37,10 +37,10 @@ #ifndef WLDATADEVICE_H #define WLDATADEVICE_H -#include <QtCompositor/private/qwayland-server-wayland.h> -#include <QtCompositor/QWaylandPointerGrabber> -#include <QtCompositor/QWaylandInputDevice> -#include <QtCompositor/QWaylandOutputSpace> +#include <QtWaylandCompositor/private/qwayland-server-wayland.h> +#include <QtWaylandCompositor/QWaylandPointerGrabber> +#include <QtWaylandCompositor/QWaylandInputDevice> +#include <QtWaylandCompositor/QWaylandOutputSpace> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp index 56c7f8026..3aa55ce18 100644 --- a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp +++ b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp @@ -36,10 +36,10 @@ #include "qwldatadevicemanager_p.h" -#include <QtCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/QWaylandCompositor> -#include <QtCompositor/private/qwaylandcompositor_p.h> -#include <QtCompositor/private/qwaylandinput_p.h> +#include <QtWaylandCompositor/private/qwaylandcompositor_p.h> +#include <QtWaylandCompositor/private/qwaylandinput_p.h> #include "qwldatadevice_p.h" #include "qwldatasource_p.h" #include "qwldataoffer_p.h" diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h index 3bc50f64e..e0109b28b 100644 --- a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h +++ b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h @@ -42,9 +42,9 @@ #include <QtGui/QClipboard> #include <QtCore/QMimeData> -#include <QtCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/QWaylandCompositor> -#include <QtCompositor/private/qwayland-server-wayland.h> +#include <QtWaylandCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwldataoffer_p.h b/src/compositor/wayland_wrapper/qwldataoffer_p.h index 58400075e..a7d17c82e 100644 --- a/src/compositor/wayland_wrapper/qwldataoffer_p.h +++ b/src/compositor/wayland_wrapper/qwldataoffer_p.h @@ -38,7 +38,7 @@ #define WLDATAOFFER_H #include <QPointer> -#include <QtCompositor/private/qwayland-server-wayland.h> +#include <QtWaylandCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwldatasource.cpp b/src/compositor/wayland_wrapper/qwldatasource.cpp index 641b63b0d..aa2af1604 100644 --- a/src/compositor/wayland_wrapper/qwldatasource.cpp +++ b/src/compositor/wayland_wrapper/qwldatasource.cpp @@ -40,7 +40,7 @@ #include "qwldatadevicemanager_p.h" #include <unistd.h> -#include <QtCompositor/private/wayland-wayland-server-protocol.h> +#include <QtWaylandCompositor/private/wayland-wayland-server-protocol.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwldatasource_p.h b/src/compositor/wayland_wrapper/qwldatasource_p.h index c183f0fe9..4df13a2b2 100644 --- a/src/compositor/wayland_wrapper/qwldatasource_p.h +++ b/src/compositor/wayland_wrapper/qwldatasource_p.h @@ -37,7 +37,7 @@ #ifndef WLDATASOURCE_H #define WLDATASOURCE_H -#include <QtCompositor/private/qwayland-server-wayland.h> +#include <QtWaylandCompositor/private/qwayland-server-wayland.h> #include <QObject> #include <QtCore/QList> diff --git a/src/compositor/wayland_wrapper/qwlregion_p.h b/src/compositor/wayland_wrapper/qwlregion_p.h index 2ea0f8f15..8867f2ffe 100644 --- a/src/compositor/wayland_wrapper/qwlregion_p.h +++ b/src/compositor/wayland_wrapper/qwlregion_p.h @@ -37,12 +37,12 @@ #ifndef WL_REGION_H #define WL_REGION_H -#include <QtCompositor/qwaylandexport.h> +#include <QtWaylandCompositor/qwaylandexport.h> #include <QRegion> #include <wayland-util.h> -#include <QtCompositor/private/qwayland-server-wayland.h> +#include <QtWaylandCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp index d65cbc567..dadc53b99 100644 --- a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp +++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp @@ -46,7 +46,7 @@ #include <wayland-server-protocol.h> #include "qwaylandshmformathelper.h" -#include <QtCompositor/private/qwaylandcompositor_p.h> +#include <QtWaylandCompositor/private/qwaylandcompositor_p.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h b/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h index ce2c2686d..5a0185638 100644 --- a/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h +++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h @@ -42,7 +42,7 @@ #include <QImage> #include <QAtomicInt> -#include <QtCompositor/QWaylandSurface> +#include <QtWaylandCompositor/QWaylandSurface> #include <wayland-server.h> |