diff options
| author | Jorgen Lind <jorgen.lind@gmail.com> | 2012-08-17 12:04:29 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-08-17 13:08:30 +0200 |
| commit | 0c8b7103017c11689fb4dd9ad4e5a6902f2fc158 (patch) | |
| tree | 0a7c36125b3e89bb59df18751bd1b1db3aaf5975 /tests | |
| parent | 882b5abd60dd254e45fc714f189fc06612ee0184 (diff) | |
Update Wayland SHA
Change-Id: I3a0adb4b935282b9bb421a87dc8241d6ea8271f0
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/client/mockoutput.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/compositor/mockclient.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/compositor/mockclient.h | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/client/mockoutput.cpp b/tests/auto/client/mockoutput.cpp index 8066c2172..6211e1535 100644 --- a/tests/auto/client/mockoutput.cpp +++ b/tests/auto/client/mockoutput.cpp @@ -59,7 +59,7 @@ void Compositor::bindOutput(wl_client *client, void *compositorData, uint32_t ve void Compositor::sendOutputGeometry(wl_resource *resource) { const QRect &r = m_outputGeometry; - wl_output_send_geometry(resource, r.x(), r.y(), r.width(), r.height(), 0, "", ""); + wl_output_send_geometry(resource, r.x(), r.y(), r.width(), r.height(), 0, "", "",0); } void Compositor::sendOutputMode(wl_resource *resource) diff --git a/tests/auto/compositor/mockclient.cpp b/tests/auto/compositor/mockclient.cpp index 4b04164b6..823e9ab9d 100644 --- a/tests/auto/compositor/mockclient.cpp +++ b/tests/auto/compositor/mockclient.cpp @@ -99,7 +99,8 @@ void MockClient::handleGlobal(wl_display *, uint32_t id, const char *interface, void MockClient::outputGeometryEvent(void *data, wl_output *, int32_t x, int32_t y, int32_t width, int32_t height, - int, const char *, const char *) + int, const char *, const char *, + int32_t ) { resolve(data)->geometry = QRect(x, y, width, height); } diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/mockclient.h index 456f7c3dd..ae7359686 100644 --- a/tests/auto/compositor/mockclient.h +++ b/tests/auto/compositor/mockclient.h @@ -91,7 +91,8 @@ private: int32_t width, int32_t height, int subpixel, const char *make, - const char *model); + const char *model, + int32_t transform); static void outputModeEvent(void *data, wl_output *wl_output, |