summaryrefslogtreecommitdiffstats
path: root/tests/auto/compositor/compositor/tst_compositor.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-01-25 12:12:45 +0100
committerLiang Qi <liang.qi@qt.io>2017-01-25 12:19:40 +0100
commit44e3a9d321190f2958e1a1bdfa7f840e56355279 (patch)
tree4d167e9d0cfcb59eb6e2dd5ed4f55981627e9339 /tests/auto/compositor/compositor/tst_compositor.cpp
parente26696524ceb58f4fe0cb7202d873240b6a9478d (diff)
parentf72d63866d3f5820865fcd309b649dc9932518ee (diff)
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts: .qmake.conf examples/wayland/custom-extension/client-common/main.cpp src/client/qwaylandwlshellintegration_p.h src/client/qwaylandxdgshellintegration_p.h src/compositor/compositor_api/qwaylandquickoutput.h src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h Change-Id: Ic78c610ddf102b0a185294f625bbfcb9238b0f3c
Diffstat (limited to 'tests/auto/compositor/compositor/tst_compositor.cpp')
-rw-r--r--tests/auto/compositor/compositor/tst_compositor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index b31d51b4..3d7d2dab 100644
--- a/tests/auto/compositor/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
@@ -315,7 +315,7 @@ void tst_WaylandCompositor::frameCallback()
class BufferView : public QWaylandView
{
public:
- void bufferCommitted(const QWaylandBufferRef &ref, const QRegion &damage) Q_DECL_OVERRIDE
+ void bufferCommitted(const QWaylandBufferRef &ref, const QRegion &damage) override
{
Q_UNUSED(damage);
bufferRef = ref;
@@ -529,7 +529,7 @@ void tst_WaylandCompositor::sendsXdgConfigure()
{
public:
MockXdgSurface(::xdg_surface *xdgSurface) : QtWayland::xdg_surface(xdgSurface) {}
- void xdg_surface_configure(int32_t width, int32_t height, wl_array *rawStates, uint32_t serial) Q_DECL_OVERRIDE
+ void xdg_surface_configure(int32_t width, int32_t height, wl_array *rawStates, uint32_t serial) override
{
configureSize = QSize(width, height);
configureSerial = serial;
@@ -729,7 +729,7 @@ void tst_WaylandCompositor::sendsIviConfigure()
{
public:
MockIviSurface(::ivi_surface *iviSurface) : QtWayland::ivi_surface(iviSurface) {}
- void ivi_surface_configure(int32_t width, int32_t height) Q_DECL_OVERRIDE
+ void ivi_surface_configure(int32_t width, int32_t height) override
{
configureSize = QSize(width, height);
}