Accepting request 1176050 from KDE:Qt6

Qt 6.7.1 (forwarded request 1175612 from krop)

OBS-URL: https://build.opensuse.org/request/show/1176050
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-declarative?expand=0&rev=38
This commit is contained in:
Ana Guerrero 2024-05-27 09:44:56 +00:00 committed by Git OBS Bridge
commit d9d0216bfe
5 changed files with 14 additions and 47 deletions

View File

@ -1,39 +0,0 @@
From 9089292c495970b00728398f49e8f66bab1f4f32 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Sat, 16 Mar 2024 02:58:08 +0800
Subject: [PATCH] Fix PointHandler rejecting click events near window edge with
HiDPI
When using HiDPI and a click happens near the window edge, the global
position might have fractional parts, but after the global position is
converted to QPoint, the position can be rounded so it happens to stay
at the window edge, so the window geometry will not contain the rounded
position.
Related bugreport: https://bugs.kde.org/show_bug.cgi?id=482580
Pick-to: 6.6 6.7
Change-Id: I51a26f955fd58f2a135c64ceb32ee881a03fcaf8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
src/quick/handlers/qquickpointerhandler.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/quick/handlers/qquickpointerhandler.cpp b/src/quick/handlers/qquickpointerhandler.cpp
index c01cbd039fd..a29c8ae2d32 100644
--- a/src/quick/handlers/qquickpointerhandler.cpp
+++ b/src/quick/handlers/qquickpointerhandler.cpp
@@ -560,10 +560,10 @@ bool QQuickPointerHandler::parentContains(const QPointF &scenePosition) const
{
if (QQuickItem *par = parentItem()) {
if (par->window()) {
- QRect windowGeometry = par->window()->geometry();
+ QRectF windowGeometry = par->window()->geometry();
if (!par->window()->isTopLevel())
- windowGeometry = QRect(QWindowPrivate::get(par->window())->globalPosition(), par->window()->size());
- QPoint screenPosition = par->window()->mapToGlobal(scenePosition.toPoint());
+ windowGeometry = QRectF(QWindowPrivate::get(par->window())->globalPosition(), par->window()->size());
+ QPointF screenPosition = par->window()->mapToGlobal(scenePosition);
if (!windowGeometry.contains(screenPosition))
return false;
}

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 21 08:31:28 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 6.7.1:
* https://www.qt.io/blog/qt-6.7.1-released
- Drop patch, merged upstream:
* 0001-Fix-PointHandler-rejecting-click-events-near-window-.patch
-------------------------------------------------------------------
Tue Apr 2 13:39:38 UTC 2024 - Christophe Marin <christophe@krop.fr>

View File

@ -16,7 +16,7 @@
#
%define real_version 6.7.0
%define real_version 6.7.1
%define short_version 6.7
%define tar_name qtdeclarative-everywhere-src
%define tar_suffix %{nil}
@ -27,17 +27,15 @@
%endif
#
Name: qt6-declarative%{?pkg_suffix}
Version: 6.7.0
Version: 6.7.1
Release: 0
Summary: Qt 6 Declarative Libraries and tools
License: GPL-2.0-only OR GPL-3.0-or-later OR LGPL-3.0-only
URL: https://www.qt.io
Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
Source99: qt6-declarative-rpmlintrc
# PATCH-FIX-OPENSUSE
Patch0: 0001-qmlimportscanner-Include-module-versions-again.patch
# PATCH-FIX-UPSTREAM kde#482580
Patch3: 0001-Fix-PointHandler-rejecting-click-events-near-window-.patch
BuildRequires: pkgconfig
BuildRequires: python3-base
BuildRequires: qt6-core-private-devel

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a0c39579a74d7cca581162c866ed0887287d4f8d5abff7ab9492d4a58fa9e2c
size 35360444

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81135c96ed2f599385b8a68c57f4f438dad193c62f946f5b200a321558fd9f1c
size 35624448