summaryrefslogtreecommitdiffstats
path: root/tests/auto/compositor
diff options
context:
space:
mode:
authorJorgen Lind <jorgen.lind@gmail.com>2012-08-17 12:04:29 +0200
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-08-17 13:08:30 +0200
commit0c8b7103017c11689fb4dd9ad4e5a6902f2fc158 (patch)
tree0a7c36125b3e89bb59df18751bd1b1db3aaf5975 /tests/auto/compositor
parent882b5abd60dd254e45fc714f189fc06612ee0184 (diff)
Update Wayland SHA
Change-Id: I3a0adb4b935282b9bb421a87dc8241d6ea8271f0 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'tests/auto/compositor')
-rw-r--r--tests/auto/compositor/mockclient.cpp3
-rw-r--r--tests/auto/compositor/mockclient.h3
2 files changed, 4 insertions, 2 deletions
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,