Commit Graph

58 Commits

Author SHA1 Message Date
hanpinlong e97ca4f020 tooltip概率不显示问题 2024-06-09 10:38:54 +08:00
hanpinlong da6756dd10
Revert "合并拼接屏相关patch"
This reverts commit 024568914a.
2024-04-30 06:51:15 +00:00
hanpinlong 5fb142d672
Revert "拼接屏2"
This reverts commit f94eb54e82.
2024-04-30 06:51:05 +00:00
hanpinlong 8ec7c9cabf
Revert "拼接屏3"
This reverts commit fc9611f154.
2024-04-30 06:50:55 +00:00
Augenblick d4d3ddb03e 撤回availablegeometry改动 2024-04-29 10:21:34 +08:00
Augenblick 890fcfcb82 添加availablegeometry功能 2024-04-26 11:37:48 +08:00
Augenblick ed2c8380a9 添加飞行键值 2024-04-08 17:32:42 +08:00
韩品龙 fc9611f154 拼接屏3 2024-03-16 15:57:44 +08:00
韩品龙 f94eb54e82 拼接屏2 2024-03-16 15:07:48 +08:00
韩品龙 024568914a 合并拼接屏相关patch 2024-03-16 14:39:43 +08:00
韩品龙 d1469cf348 修复应用关闭后从托盘处点击出来后hover状态异常的问题 2024-01-15 14:39:21 +08:00
liuyapeng 8268a3b2d5 bugfix:#I6YMV4【任务栏】任务栏尺寸为小和中时,任务栏下方有缝隙 2023-12-19 17:37:20 +08:00
韩品龙 a0fcf99a64 修复编译错误 2023-11-20 15:38:43 +08:00
tanjing b513ad746f 去掉combobox下拉框中绘制的背景 2023-11-20 11:28:33 +08:00
liuyapeng 1cd1e27410 bugfix:#I79FD0【文件管理器】【wayland】侧边栏悬停显示位置不正确 2023-11-20 11:26:50 +08:00
韩品龙 9c12bed296 添加触摸相关的patch 2023-11-20 11:26:28 +08:00
liuyapeng 1547207939 bugfix:#I79FD0【文件管理器】【wayland】侧边栏悬停显示位置不正确 2023-11-20 11:26:03 +08:00
韩品龙 b73a5a4da0 合并双屏登录页面锁屏异常patch 2023-11-20 11:22:27 +08:00
Wei Wei 815d6c2192 Fix highdpi conversion of QTabletEvent coordinates on xcb
when high-dpi scaling is enabled, there was an offset
from the cursor position to the event position, because
QWindow::mapFromGlobal() works in device-independent
pixels, but we are using actual screen pixels here.

Task-number: QTBUG-77826
Backport from upstream:
    Change-Id: Ic8743b9e5c4041065f530ed1d9d6c49337b0207a
    Commit: 9d51fb579bb4655f6740096f17f1ced50258c28f
2023-11-20 11:20:44 +08:00
韩品龙 2ac5249eb0 合并触摸patch1 2023-11-20 11:20:38 +08:00
韩品龙 666891139d init for 5.15.10 2023-11-20 09:56:35 +08:00
tanjing fd853bf386 去掉combobox下拉框中绘制的背景 2023-11-17 15:23:25 +08:00
liuyapeng 0f2dc49efc bugfix:#I79FD0【文件管理器】【wayland】侧边栏悬停显示位置不正确 2023-11-08 17:32:40 +08:00
韩品龙 7fd2ef7c6a 添加触摸相关的patch 2023-10-30 09:36:46 +08:00
liuyapeng 189be696fa bugfix:#I79FD0【文件管理器】【wayland】侧边栏悬停显示位置不正确 2023-10-13 15:18:48 +08:00
韩品龙 8cf31fcae9 合并双屏登录页面锁屏异常patch 2023-06-19 14:54:22 +08:00
hanpinlong 94c3760749
!11 修复 xcb 上高 dpi 时触控笔坐标异常
Merge pull request !11 from amphetamineWei/openkylin/yangtze-dev
2023-05-25 03:13:40 +00:00
韩品龙 1db31409a2 修复编译错误 2023-05-24 16:13:50 +08:00
Wei Wei 7408a3f782 Fix highdpi conversion of QTabletEvent coordinates on xcb
when high-dpi scaling is enabled, there was an offset
from the cursor position to the event position, because
QWindow::mapFromGlobal() works in device-independent
pixels, but we are using actual screen pixels here.

Task-number: QTBUG-77826
Backport from upstream:
    Change-Id: Ic8743b9e5c4041065f530ed1d9d6c49337b0207a
    Commit: 9d51fb579bb4655f6740096f17f1ced50258c28f
2023-05-24 15:08:00 +08:00
韩品龙 21d61d53d9 合并触摸patch 2023-05-24 13:43:45 +08:00
韩品龙 86ca2acfe9 fix-build-error 2023-05-05 17:25:02 +08:00
韩品龙 45f317b035 merge upstream 5.15.8 2023-05-05 14:09:45 +08:00
fnoily e62a8a4709 [PATCH] 1.Del-touch-point-without-target.patch
2.Fix-touch-failure-after-right-click-menu.patch
2023-01-04 16:18:02 +08:00
Rex Dieter d15c3bad99 properly cast types for libglvnd 1.3.4
Origin: https://src.fedoraproject.org/rpms/qt5-qtbase/blob/rawhide/f/qtbase-everywhere-src-5.15.2-libglvnd.patch

Gbp-Pq: Name cast_types_for_egl_x11_test.diff
2022-05-14 17:41:01 +08:00
Helmut Grohne e54e6798fd call pkgconfig in order to be able to cross build qtbase with MySql.
Qt's build system calls mysql_config... which won't work in a cross build
environment like Debian's, as it will throw an exec format error.

In order to solve this call pkgconfig and use mysqlclient.pc.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971604
Forwarded: not-needed
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>

Gbp-Pq: Name cross_build_mysql.diff
2022-05-14 17:41:01 +08:00
Pino Toscano b188e29799 Limit Linux-only code with Q_OS_LINUX
The QStorageInfo/QStorageIterator implementation used for Linux is used also
on Hurd, as it uses an interface provided by GNU libc.
QStorageIterator::device() tries to use PATH_MAX (unavailable on the Hurd)
to lookup a /dev/block/ path, which exists on Linux only; hence, perform that
check within a Q_OS_LINUX block.
Forwarded: no
Last-Update: 2020-04-19

Gbp-Pq: Name qstorageinfo_linux.diff
2022-05-14 17:41:01 +08:00
Pino Toscano c8020902a0 Avoid unconditional PATH_MAX usage
Use a "safe" size in case PATH_MAX is not defined; in the end, this should not
be used, as a allocating realpath() will be used instead.
Forwarded: no
Last-Update: 2020-04-19

Gbp-Pq: Name path_max.diff
2022-05-14 17:41:01 +08:00
Dmitry Shachnev 47fd91bb89 guard UTIME_NOW/UTIME_OMIT usages
Forwarded: no
Last-Update: 2018-02-22

Gbp-Pq: Name nonlinux_utime.diff
2022-05-14 17:41:01 +08:00
Dmitry Shachnev 7378d28c3d support ARMv4 architecture, needed for armel builds
Forwarded: no
Last-Update: 2016-07-01

Gbp-Pq: Name armv4.diff
2022-05-14 17:41:01 +08:00
Dmitry Shachnev 1924e95bf8 catch linker warnings in some config tests
Without this, qmake wrongly thinks that the tests succeed, for example:

./config.tests/unix/futimens/futimens.cpp:44: warning: futimens is not implemented and will always fail
test config.corelib.tests.futimens succeeded
Forwarded: https://codereview.qt-project.org/163214 (rejected)
Bug: https://bugs.debian.org/827935
Last-Update: 2019-03-02

Gbp-Pq: Name gnukfreebsd_linker_warnings.diff
2022-05-14 17:41:01 +08:00
Fathi Boudra cde9636976 build ibase sql plugin against firebird
Forwarded: no
Last-Update: 2017-06-30

Gbp-Pq: Name link_fbclient.diff
2022-05-14 17:41:01 +08:00
Debian Qt/KDE Maintainers db597cc481 handle even more include in enum cases
The solution in d3ed7dac8aa2f4ede0c409254b9dd44842086be0 was needlessly
complicated, and broke a valid use case.
The issue of no identifier being available to parse after the include
has been processed can instead be solved by moving the test for the
closing brace after the include processing.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=87973325f1b99f2b
Last-Update: 2022-04-07

Gbp-Pq: Name moc_handle_include.diff
2022-05-14 17:41:01 +08:00
Debian Qt/KDE Maintainers ba37f387b4 Fix builds of qtconcurrentthreadengine.h with GCC 11
Without this patch, all the code that #includes QtConcurrent headers
will fail to compile with GCC 11.
Origin: upstream, https://codereview.qt-project.org/c/qt/qtbase/+/339417
Last-Update: 2022-04-01

Gbp-Pq: Name gcc-11-qtconcurrentthreadengine.diff
2022-05-14 17:41:01 +08:00
Debian Qt/KDE Maintainers 377c552430 QProcess: ensure we don't accidentally execute something from CWD
Unless "." (or the empty string) is in $PATH, we're not supposed to find
executables in the current directory. This is how the Unix shells behave
and we match their behavior. It's also the behavior Qt had prior to 5.9
(commit 28666d167aa8e602c0bea25ebc4d51b55005db13). On Windows, searching
the current directory is the norm, so we keep that behavior.

This commit does not add an explicit check for an empty return from
QStandardPaths::findExecutable(). Instead, we allow that empty string to
go all the way to execve(2), which will fail with ENOENT. We could catch
it early, before fork(2), but why add code for the error case?

See https://kde.org/info/security/advisory-20220131-1.txt
Origin: upstream, https://download.qt.io/official_releases/qt/5.15/CVE-2022-25255-qprocess5-15.diff
Last-Update: 2022-02-21

Gbp-Pq: Name CVE-2022-25255.diff
2022-05-14 17:41:01 +08:00
Debian Qt/KDE Maintainers c190e34a6f upstream fixes to support OpenSSL 3.0
Origin: upstream, commits
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=3186ca3e3972cf46
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=408656c6f9de326c
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=ae6590e360fbb04d
 and a small part of
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4c0f81490ba0c4ec
Last-Update: 2021-12-09

Gbp-Pq: Name openssl3.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers 0db85e1da1 avoid processing-intensive painting of high number of tiny dashes
When stroking a dashed path, an unnecessary amount of processing would
be spent if there is a huge number of dashes visible, e.g. because of
scaling. Since the dashes are too small to be individually visible
anyway, just replace with a semi-transparent solid line for such
cases.
Origin: upstream, commits:
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=f4d791b330d02777
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6b400e3147dcfd8c
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84aba80944a2e1c3
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=cca8ed0547405b1c
Last-Update: 2021-11-27

Gbp-Pq: Name CVE-2021-38593.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers a982f33688 treat the MYSQL_FIELD as read-only
The MariaDB-connector-c version 3.2 and MariaDB server version 10.6
cooperate to avoid re-transferring the query metadata, so the fact that
we were modifying it was causing it to improperly decode the DATETIME
data types into string, as we had asked. We ended up with a 7-byte
string that was actually the date binary-encoded.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=549ee216fd5bf2b3
Last-Update: 2021-11-13

Gbp-Pq: Name mysql_field_readonly.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers a2bad8b5ef fix recursion crash when calling setStyleSheet with qproperty-styleSheet
When calling setStyleSheet with property qproperty-styleSheet,
QStyleSheetStyle::polish will call QStyleSheetStyle::setProperties,
and then QStyleSheetStyle::setProperties goes on to call setProperty.
Because there is property qproperty-styleSheet, it will update
stylesheet by calling QStyleSheetStyle::polish.
This causes the recursive call to crash.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=e9cdcc7cb314586a
Last-Update: 2021-11-13

Gbp-Pq: Name fix_recursion_crash.diff
2022-05-14 17:41:00 +08:00
Liang Qi fdd828e560 [PATCH] xcb: add a timeout control when reading INCR property
For the first call of QXcbClipboard::clipboardReadProperty()
inside of clipboardReadIncrementalProperty() in getSelection(),
it will get a XCB_NONE reply before the contents arrived via
property change. Then we give a chance to read more.

Manually tested with following setups:
* examples/widgets/mainwindows/application with gvim(gtk3)
* examples/widgets/widgets/imageviewer with GIMP 2.10.18(based on
gtk2) and GIMP 2.99.6(based on gtk3 via flatpak)

Fixes: QTBUG-56595
Pick-to: 5.12 5.15 6.1 6.2
Done-With: JiDe Zhang <zhangjide@uniontech.com>
Change-Id: Ib45f08464d39ad79137b1da99808c89b7dca2d08
Reviewed-by: JiDe Zhang <zhangjide@uniontech.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

Gbp-Pq: Name xcb_add_a_timeout_control_when_reading_INCR_property.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers 96f1345c14 fix QTextFormat::FullWidthSelection for right-to-left text layouts
Using the QTextFormat::FullWidthSelection property to select a line
would previously not take into account right-to-left text layouts.

With this patch, the whole line should now be drawn correctly for both
left-to-right, and right-to-left layouts.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=a7894855f2f59028
Last-Update: 2021-08-15

Gbp-Pq: Name full_width_selection_rtl.diff
2022-05-14 17:41:00 +08:00