diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-06-29 21:42:03 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-06-29 21:42:03 (GMT) |
| commit | 0a8daa8845325fba9cf2ec973eb6bab8a2853dd5 (patch) | |
| tree | 504c698037ee6283f1b5dbc6fa658bb2bfffb99a /src/plugins/platforms/wayland/qwaylanddisplay.h | |
| parent | 680023c4921019614948c277cde5498645836cb9 (diff) | |
| parent | 6b3f2a3b96d01dc339d07a076300d29616603b28 (diff) | |
| download | Qt-0a8daa8845325fba9cf2ec973eb6bab8a2853dd5.zip Qt-0a8daa8845325fba9cf2ec973eb6bab8a2853dd5.tar.gz Qt-0a8daa8845325fba9cf2ec973eb6bab8a2853dd5.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylanddisplay.h')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylanddisplay.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.h b/src/plugins/platforms/wayland/qwaylanddisplay.h index 765be62..4dff24d 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.h +++ b/src/plugins/platforms/wayland/qwaylanddisplay.h @@ -128,7 +128,16 @@ private: static void outputHandleGeometry(void *data, struct wl_output *output, int32_t x, int32_t y, - int32_t width, int32_t height); + int32_t width, int32_t height, + int subpixel, + const char *make, + const char *model); + static void mode(void *data, + struct wl_output *wl_output, + uint32_t flags, + int width, + int height, + int refresh); static void handleVisual(void *data, struct wl_compositor *compositor, |