Fix build errors due to api changes in QtBase

Change-Id: Ie171d9342d877792c2f0b19694ff020965d91985
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/examples/qwidget-compositor/main.cpp b/examples/qwidget-compositor/main.cpp
index c021425..9333e18 100644 (file)
--- a/examples/qwidget-compositor/main.cpp
+++ b/examples/qwidget-compositor/main.cpp
@@ -302,7 +302,7 @@ protected:
             return;
         }
         if (m_moveSurface) {
-            m_moveSurface->setPos(e->posF() - m_moveOffset);
+            m_moveSurface->setPos(e->localPos() - m_moveOffset);
             update();
             return;
         }

diff --git a/src/plugins/platforms/wayland/qwaylandcursor.cpp b/src/plugins/platforms/wayland/qwaylandcursor.cpp
index 7c6e8ca..e73c7bc 100644 (file)
--- a/src/plugins/platforms/wayland/qwaylandcursor.cpp
+++ b/src/plugins/platforms/wayland/qwaylandcursor.cpp
@@ -213,7 +213,7 @@ void QWaylandCursor::setupPixmapCursor(QCursor *cursor)
     ensureSurface(cursor->pixmap().size());
     QImage src = cursor->pixmap().toImage().convertToFormat(QImage::Format_ARGB32);
     for (int y = 0; y < src.height(); ++y)
-        qMemCopy(mBuffer->image()->scanLine(y), src.scanLine(y), src.bytesPerLine());
+        memcpy(mBuffer->image()->scanLine(y), src.scanLine(y), src.bytesPerLine());
     mDisplay->setCursor(mSurface, cursor->hotSpot().x(), cursor->hotSpot().y());
 }