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/imports | |
| 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/imports')
| -rw-r--r-- | src/imports/compositor/compositor.pro | 2 | ||||
| -rw-r--r-- | src/imports/compositor/qwaylandmousetracker_p.h | 2 | ||||
| -rw-r--r-- | src/imports/compositor/qwaylandquickcompositorplugin.cpp | 26 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/imports/compositor/compositor.pro b/src/imports/compositor/compositor.pro index 80bda74b1..f6a444a25 100644 --- a/src/imports/compositor/compositor.pro +++ b/src/imports/compositor/compositor.pro @@ -41,6 +41,6 @@ RESOURCES += $$GENERATED_RESOURCE_FILE CONFIG(debug, debug|release): QML_FILES += $$COMPOSITOR_QML_FILES DEFINES += QT_COMPOSITOR_QUICK -QT += quick-private qml-private gui-private core-private compositor compositor-private +QT += quick-private qml-private gui-private core-private waylandcompositor waylandcompositor-private load(qml_plugin) diff --git a/src/imports/compositor/qwaylandmousetracker_p.h b/src/imports/compositor/qwaylandmousetracker_p.h index 4270151ca..e6e5a679d 100644 --- a/src/imports/compositor/qwaylandmousetracker_p.h +++ b/src/imports/compositor/qwaylandmousetracker_p.h @@ -39,7 +39,7 @@ #include <QtQuick/private/qquickmousearea_p.h> -#include <QtCompositor/qwaylandexport.h> +#include <QtWaylandCompositor/qwaylandexport.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp index 1c693000a..8581b0a7b 100644 --- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp +++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp @@ -39,19 +39,19 @@ #include <QtQuick/QQuickItem> -#include <QtCompositor/QWaylandQuickCompositor> -#include <QtCompositor/QWaylandQuickItem> -#include <QtCompositor/QWaylandQuickSurface> -#include <QtCompositor/QWaylandClient> -#include <QtCompositor/QWaylandQuickOutput> -#include <QtCompositor/QWaylandOutputSpace> -#include <QtCompositor/QWaylandExtension> -#include <QtCompositor/QWaylandQuickExtension> -#include <QtCompositor/QWaylandInputDevice> - -#include <QtCompositor/QWaylandShell> - -#include <QtCompositor/qwaylandexport.h> +#include <QtWaylandCompositor/QWaylandQuickCompositor> +#include <QtWaylandCompositor/QWaylandQuickItem> +#include <QtWaylandCompositor/QWaylandQuickSurface> +#include <QtWaylandCompositor/QWaylandClient> +#include <QtWaylandCompositor/QWaylandQuickOutput> +#include <QtWaylandCompositor/QWaylandOutputSpace> +#include <QtWaylandCompositor/QWaylandExtension> +#include <QtWaylandCompositor/QWaylandQuickExtension> +#include <QtWaylandCompositor/QWaylandInputDevice> + +#include <QtWaylandCompositor/QWaylandShell> + +#include <QtWaylandCompositor/qwaylandexport.h> #include "qwaylandmousetracker_p.h" QT_BEGIN_NAMESPACE |