openwrt-mirror/video
1
0
Fork 0
mirror of https://github.com/openwrt/video.git synced 2025-12-21 19:14:35 +04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mirko Vogt
2017-12-11 17:38:30 +01:00
parent 615ee01e17
commit e611d59c05
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
frameworks/qt5base/patches/005-fix-segv-if-no-cursor.patch
View File

@@ -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;