Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2019-09-07 11:30:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Sat Sep 7 11:30:12 2019 rev:100 rq:727923 version:5.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2019-08-19 20:46:34.413108952 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.7948/libqt5-qtbase.changes 2019-09-07 11:30:14.414458148 +0200 @@ -1,0 +2,6 @@ +Mon Sep 2 08:26:30 UTC 2019 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patch to fix crash during Drag-and-Drop: + * 0001-Fix-crash-with-drag-cursor-handling.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-crash-with-drag-cursor-handling.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.g5LRfg/_old 2019-09-07 11:30:18.742457607 +0200 +++ /var/tmp/diff_new_pack.g5LRfg/_new 2019-09-07 11:30:18.754457606 +0200 @@ -85,6 +85,7 @@ Patch60: 0001-Decrease-focusInTimer-timer-from-400-to-200.patch # patches 1000-2000 and above from upstream 5.13 branch # Patch1000: 0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch +Patch1001: 0001-Fix-crash-with-drag-cursor-handling.patch # patches 2000-3000 and above from upstream 5.14/dev branch # Patch2000: 0001-Fix-notification-of-QDockWidget-when-it-gets-undocke.patch # Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384 ++++++ 0001-Fix-crash-with-drag-cursor-handling.patch ++++++ >From d1141b6c90e53554f69fd6a7a272988211f5bd34 Mon Sep 17 00:00:00 2001 From: Joni Poikelin <joni.poike...@qt.io> Date: Thu, 28 Feb 2019 09:54:20 +0200 Subject: [PATCH] Fix crash with drag cursor handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7a7c722782a435f7c01b94f48df7a5f4ff4d599e caused a regresssion in some cases. Change-Id: I1089a79534d811b195de663ff664d9ba5a6ac6c5 Fixes: QTBUG-74110 Reviewed-by: Tor Arne Vestbø <tor.arne.ves...@qt.io> --- src/gui/kernel/qsimpledrag.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp index 9aab332ef5..bd409c124f 100644 --- a/src/gui/kernel/qsimpledrag.cpp +++ b/src/gui/kernel/qsimpledrag.cpp @@ -310,11 +310,15 @@ void QBasicDrag::updateCursor(Qt::DropAction action) m_dndHasSetOverrideCursor = true; } else { QCursor *cursor = QGuiApplication::overrideCursor(); - if (!pixmap.isNull()) { - if (cursor->pixmap().cacheKey() != pixmap.cacheKey()) - QGuiApplication::changeOverrideCursor(QCursor(pixmap)); - } else if (cursorShape != cursor->shape()) { - QGuiApplication::changeOverrideCursor(QCursor(cursorShape)); + if (!cursor) { + QGuiApplication::changeOverrideCursor(pixmap.isNull() ? QCursor(cursorShape) : QCursor(pixmap)); + } else { + if (!pixmap.isNull()) { + if (cursor->pixmap().cacheKey() != pixmap.cacheKey()) + QGuiApplication::changeOverrideCursor(QCursor(pixmap)); + } else if (cursorShape != cursor->shape()) { + QGuiApplication::changeOverrideCursor(QCursor(cursorShape)); + } } } #endif -- 2.22.0
