From: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Date: Fri, 17 Feb 2012 23:01:32 +0000 (+0200)
Subject: Fix wayland plugin and qwindow-compositor compilation
X-Git-Tag: qt-v5.0.0-alpha1~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bc65bc92bc1961059c7ecadfe4253db2f488801;p=profile%2Fivi%2Fqtwayland.git

Fix wayland plugin and qwindow-compositor compilation

Apparently some qtbase change triggers the need to include a bunch of
headers which were not properly included before. The extra mouse
button support in the platform plugin simply did not compile.

Change-Id: I7d518021fa81f2d5232277f0bce26e48effbeae3
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
---

diff --git a/examples/qwindow-compositor/qwindowcompositor.cpp b/examples/qwindow-compositor/qwindowcompositor.cpp
index 572e61f..8c4f9cd 100644
--- a/examples/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/qwindow-compositor/qwindowcompositor.cpp
@@ -43,6 +43,10 @@
 #include <QKeyEvent>
 #include <QTouchEvent>
 #include <QOpenGLFunctions>
+#include <QGuiApplication>
+#include <QCursor>
+#include <QPixmap>
+#include <QLinkedList>
 
 #include <QtCompositor/waylandinput.h>
 
diff --git a/examples/qwindow-compositor/qwindowcompositor.h b/examples/qwindow-compositor/qwindowcompositor.h
index 4a2f100..09bf08f 100644
--- a/examples/qwindow-compositor/qwindowcompositor.h
+++ b/examples/qwindow-compositor/qwindowcompositor.h
@@ -48,6 +48,7 @@
 
 #include <QtGui/private/qopengltexturecache_p.h>
 #include <QObject>
+#include <QTimer>
 
 class QWindowCompositor : public QObject, public WaylandCompositor
 {
diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
index 9062ff6..4f94156 100644
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
@@ -205,7 +205,7 @@ void QWaylandInputDevice::inputHandleButton(void *data,
     case 286:
         qt_button = Qt::ExtraButton12;
         break;
-    case 285:
+    case 287:
         qt_button = Qt::ExtraButton13;
         break;
     default: