qt5base: extend patch to prevent SEGV when hiding cursor is desired

diff --git a/frameworks/qt5base/patches/005-fix-segv-if-no-cursor.patch b/frameworks/qt5base/patches/005-fix-segv-if-no-cursor.patch
index 5c78d8fa56f3065c80738202c45836a495782952..cf34e4d17e0b4aa45a84a655c2d2df7bf6a63b7b 100644 (file)
--- a/frameworks/qt5base/patches/005-fix-segv-if-no-cursor.patch
+++ b/frameworks/qt5base/patches/005-fix-segv-if-no-cursor.patch
@@ -18,6 +18,8 @@ diff --git a/src/platformsupport/fbconvenience/qfbcursor.cpp b/src/platformsuppo
 index 7daf3f4d0c..c7b1a71c04 100644
 --- a/src/platformsupport/fbconvenience/qfbcursor.cpp
 +++ b/src/platformsupport/fbconvenience/qfbcursor.cpp
+--- a/src/platformsupport/fbconvenience/qfbcursor.cpp
++++ b/src/platformsupport/fbconvenience/qfbcursor.cpp
 @@ -112,6 +112,8 @@ void QFbCursor::pointerEvent(const QMouseEvent &e)
      if (e.type() != QEvent::MouseMove)
          return;
@@ -27,6 +29,13 @@ index 7daf3f4d0c..c7b1a71c04 100644
      mCurrentRect = getCurrentRect();
      if (mOnScreen || mScreen->geometry().intersects(mCurrentRect.translated(mScreen->geometry().topLeft())))
          setDirty();
--- 
-2.15.0
+@@ -165,6 +167,9 @@ void QFbCursor::setCursor(const uchar *data, const uchar *mask, int width, int h
+ #ifndef QT_NO_CURSOR
+ void QFbCursor::changeCursor(QCursor * widgetCursor, QWindow *window)
+ {
++    if (!mVisible)
++        return;
++
+     Q_UNUSED(window);
+     const Qt::CursorShape shape = widgetCursor ? widgetCursor->shape() : Qt::ArrowCursor;