diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-05-13 14:50:55 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:32 +0200 |
commit | e0f3d22925857e654d400d0878e2dec192a1d2d7 (patch) | |
tree | 6c6ebe045fe35f308aa0d440f6a5ab6029006a4b | |
parent | 666c3fcc69b9b25caa9b68b988e0004489653171 (diff) |
Fix missing file rename from QWayalandQuickView -> ....Item
Change-Id: I12a12c3f476d223dc278c34ab1a9a39cc5b5f9e5
-rw-r--r-- | examples/wayland/qml-compositor/main.cpp | 2 | ||||
-rw-r--r-- | examples/wayland/server-buffer/compositor/main.cpp | 2 | ||||
-rw-r--r-- | src/compositor/compositor_api/compositor_api.pri | 5 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickcompositor.cpp | 3 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp (renamed from src/compositor/compositor_api/qwaylandquickview.cpp) | 2 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.h (renamed from src/compositor/compositor_api/qwaylandquickview.h) | 0 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandquicksurface.cpp | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/examples/wayland/qml-compositor/main.cpp b/examples/wayland/qml-compositor/main.cpp index 7c11286dc..331679b37 100644 --- a/examples/wayland/qml-compositor/main.cpp +++ b/examples/wayland/qml-compositor/main.cpp @@ -42,7 +42,7 @@ #include "qwaylandquickcompositor.h" #include "qwaylandquicksurface.h" -#include <QtCompositor/qwaylandquickview.h> +#include <QtCompositor/qwaylandquickitem.h> #include <QtCompositor/qwaylandoutput.h> #include <QtCompositor/qwaylandoutputspace.h> diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp index 4e4dae3ec..9ad19c546 100644 --- a/examples/wayland/server-buffer/compositor/main.cpp +++ b/examples/wayland/server-buffer/compositor/main.cpp @@ -41,7 +41,7 @@ #include "qwaylandquickcompositor.h" #include "qwaylandsurface.h" -#include "qwaylandquickview.h" +#include "qwaylandquickitem.h" #include "qwaylandoutputspace.h" #include <QGuiApplication> diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri index a40292f8b..c97e16e27 100644 --- a/src/compositor/compositor_api/compositor_api.pri +++ b/src/compositor/compositor_api/compositor_api.pri @@ -20,7 +20,6 @@ HEADERS += \ compositor_api/qwaylandview.h \ compositor_api/qwaylandview_p.h - SOURCES += \ compositor_api/qwaylandcompositor.cpp \ compositor_api/qwaylandclient.cpp \ @@ -44,13 +43,13 @@ qtHaveModule(quick) { compositor_api/qwaylandquickcompositor.cpp \ compositor_api/qwaylandquicksurface.cpp \ compositor_api/qwaylandquickoutput.cpp \ - compositor_api/qwaylandquickview.cpp + compositor_api/qwaylandquickitem.cpp HEADERS += \ compositor_api/qwaylandquickcompositor.h \ compositor_api/qwaylandquicksurface.h \ compositor_api/qwaylandquickoutput.h \ - compositor_api/qwaylandquickview.h + compositor_api/qwaylandquickitem.h QT += qml quick } diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp index e8ff9c927..14e80f0c3 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp @@ -44,7 +44,8 @@ #include "qwaylandquickcompositor.h" #include "qwaylandquicksurface.h" #include "qwaylandquickoutput.h" -#include "qwaylandquickview.h" +#include "qwaylandquickitem.h" +#include "qwaylandoutput.h" QT_BEGIN_NAMESPACE diff --git a/src/compositor/compositor_api/qwaylandquickview.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 66518fb24..9139d3fbc 100644 --- a/src/compositor/compositor_api/qwaylandquickview.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include "qwaylandquickview.h" +#include "qwaylandquickitem.h" #include "qwaylandquicksurface.h" #include <QtCompositor/qwaylandcompositor.h> #include <QtCompositor/qwaylandinput.h> diff --git a/src/compositor/compositor_api/qwaylandquickview.h b/src/compositor/compositor_api/qwaylandquickitem.h index 20a4256a5..20a4256a5 100644 --- a/src/compositor/compositor_api/qwaylandquickview.h +++ b/src/compositor/compositor_api/qwaylandquickitem.h diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp index fda3c2110..c47736561 100644 --- a/src/compositor/compositor_api/qwaylandquicksurface.cpp +++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp @@ -42,7 +42,7 @@ #include "qwaylandquicksurface.h" #include "qwaylandquickcompositor.h" #include "qwaylandoutput.h" -#include "qwaylandquickview.h" +#include "qwaylandquickitem.h" #include <QtCompositor/qwaylandbufferref.h> #include <QtCompositor/private/qwaylandsurface_p.h> |