diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-22 11:52:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-22 13:01:10 +0100 |
| commit | 1046abd729e36c07dccff313536aa0cbb104e097 (patch) | |
| tree | 728a000c96898a643f9140e4430489ca18c58eca /src/compositor | |
| parent | 4c5bd43353706287865736afeed8e74cff9b458d (diff) | |
| parent | 5f645af22bb63f0d215294535cf683029ed7aab5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/3rdparty/protocol/qt_attribution.json
src/client/qwaylandintegration.cpp
Change-Id: I475889f2817c7094b68a2948fdd34ddf8b0c486f
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.h | 2 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickoutput.cpp | 2 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index 6bc3c1886..c343d6f84 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -121,8 +121,6 @@ public: QWaylandSeat *defaultSeat() const; - QWaylandView *createSurfaceView(QWaylandSurface *surface); - QWaylandSeat *seatFor(QInputEvent *inputEvent); bool useHardwareIntegrationExtension() const; diff --git a/src/compositor/compositor_api/qwaylandquickoutput.cpp b/src/compositor/compositor_api/qwaylandquickoutput.cpp index 79e4fdec7..c6294eead 100644 --- a/src/compositor/compositor_api/qwaylandquickoutput.cpp +++ b/src/compositor/compositor_api/qwaylandquickoutput.cpp @@ -66,7 +66,7 @@ void QWaylandQuickOutput::initialize() this, &QWaylandQuickOutput::updateStarted, Qt::DirectConnection); - connect(quickWindow, &QQuickWindow::beforeRendering, + connect(quickWindow, &QQuickWindow::afterRendering, this, &QWaylandQuickOutput::doFrameCallbacks); } diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index eef51283c..cc61fb17a 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -983,7 +983,6 @@ void QWaylandSurfacePrivate::Subsurface::subsurface_set_desync(wl_subsurface::Re * This signal is emitted when a wl_subsurface, \a child, has been added to the surface. */ - void surfaceDestroyed(); /*! * \qmlsignal QtWaylandCompositor::WaylandSurface::surfaceDestroyed() * |