Merge trunk

[ Gerry Boland ]
* Depend on :native version of g++ to allow cross-compiling to work.
  (LP: #1353855)
[ Michał Sawicz ]
* Declare the QByteArray in callDispatcher so it doesn't get deleted
  before it's copied. (LP: #1408819)
[ Josh Arenson ]
* Assign touch events area to the correct values.
[ Albert Astals ]
* Move the creation of the surface observer to
  SessionListener::surface_created

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp b/tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp
index d0a6733..1e16bf0 100644
--- a/tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp
+++ b/tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp
@@ -86,7 +86,7 @@ TEST(MirSurfaceItemTest, MissingTouchEnd)
         }));
 
 
-    MirSurfaceItem *surfaceItem = new MirSurfaceItem(mockSurface, mockSession);
+    MirSurfaceItem *surfaceItem = new MirSurfaceItem(mockSurface, mockSession, nullptr);
 
     ulong timestamp = 1234;
     QList<QTouchEvent::TouchPoint> touchPoints;