diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-30 15:21:17 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:42 +0200 |
commit | 0f3c1a1669aa133efd8701f25b8b8093517b81a7 (patch) | |
tree | 964e3be6ecd36c0c4eeafbab0f65e74eac9ee80b /src/compositor/compositor_api/qwaylandquickcompositor.cpp | |
parent | d1359f8b0c2b8fcffc2112d2e29d530ac1ab7c9a (diff) |
Rename QWaylandSurfaceView to QWaylandView
and rename QWaylandSurfaceItem to QWaylandQuickView
Change-Id: I989b482eb79df06e9f265bc2b0ef6b3dce7509d6
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickcompositor.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickcompositor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp index 75027299b..f9c6e5341 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp @@ -43,8 +43,8 @@ #include "qwaylandclient.h" #include "qwaylandquickcompositor.h" #include "qwaylandquicksurface.h" -#include "qwaylandsurfaceitem.h" #include "qwaylandquickoutput.h" +#include "qwaylandquickview.h" QT_BEGIN_NAMESPACE @@ -72,7 +72,7 @@ void QWaylandQuickCompositor::registerLegacyQmlNames() { static bool initialized = false; if (!initialized) { - qmlRegisterUncreatableType<QWaylandSurfaceItem>("QtCompositor", 1, 0, "WaylandSurfaceItem", QObject::tr("Cannot create instance of WaylandSurfaceItem")); + qmlRegisterUncreatableType<QWaylandQuickView>("QtCompositor", 1, 0, "WaylandSurfaceItem", QObject::tr("Cannot create instance of WaylandSurfaceItem")); qmlRegisterUncreatableType<QWaylandQuickSurface>("QtCompositor", 1, 0, "WaylandQuickSurface", QObject::tr("Cannot create instance of WaylandQuickSurface")); qmlRegisterUncreatableType<QWaylandClient>("QtCompositor", 1, 0, "WaylandClient", QObject::tr("Cannot create instance of WaylandClient")); qmlRegisterUncreatableType<QWaylandOutput>("QtCompositor", 1, 0, "WaylandOutput", QObject::tr("Cannot create instance of WaylandOutput")); @@ -120,9 +120,9 @@ QWaylandOutput *QWaylandQuickCompositor::createOutput(QWaylandOutputSpace *outpu return output; } -QWaylandSurfaceView *QWaylandQuickCompositor::createView() +QWaylandView *QWaylandQuickCompositor::createView() { - QWaylandSurfaceItem *view = new QWaylandSurfaceItem(); + QWaylandQuickView *view = new QWaylandQuickView(); QQmlEngine::setObjectOwnership(view, QQmlEngine::JavaScriptOwnership); return view; } |