diff -Nru qtbase-opensource-src-5.15.10+dfsg/debian/changelog qtbase-opensource-src-5.15.10+dfsg/debian/changelog
--- qtbase-opensource-src-5.15.10+dfsg/debian/changelog 2023-11-20 15:40:31.000000000 +0800
+++ qtbase-opensource-src-5.15.10+dfsg/debian/changelog 2023-11-20 15:40:31.000000000 +0800
@@ -1,4 +1,4 @@
-qtbase-opensource-src (5.15.10+dfsg-3ok1.3) nile; urgency=medium
+qtbase-opensource-src (5.15.10+dfsg-3ok1.4) nile; urgency=medium
* add some old kylin patches
diff -Nru qtbase-opensource-src-5.15.10+dfsg/debian/patches/series qtbase-opensource-src-5.15.10+dfsg/debian/patches/series
--- qtbase-opensource-src-5.15.10+dfsg/debian/patches/series 2023-11-20 15:40:31.000000000 +0800
+++ qtbase-opensource-src-5.15.10+dfsg/debian/patches/series 2023-11-20 15:40:31.000000000 +0800
@@ -34,3 +34,4 @@
0034-update-debian-changelog-to-5.15.10-dfsg-3ok1.1.patch
0035-update-debian-changelog-to-5.15.10-dfsg-3ok1.2.patch
suofang.patch
+suofang-2.patch
diff -Nru qtbase-opensource-src-5.15.10+dfsg/debian/patches/suofang-2.patch qtbase-opensource-src-5.15.10+dfsg/debian/patches/suofang-2.patch
--- qtbase-opensource-src-5.15.10+dfsg/debian/patches/suofang-2.patch 1970-01-01 08:00:00.000000000 +0800
+++ qtbase-opensource-src-5.15.10+dfsg/debian/patches/suofang-2.patch 2023-11-20 15:40:31.000000000 +0800
@@ -0,0 +1,49 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ qtbase-opensource-src (5.15.10+dfsg-3ok1.4) nile; urgency=medium
+ .
+ * add some old kylin patches
+Author: liuyapeng <liuyapeng@kylinos.cn>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2023-12-12
+
+--- qtbase-opensource-src-5.15.10+dfsg.orig/src/plugins/platforms/xcb/qxcbwindow.cpp
++++ qtbase-opensource-src-5.15.10+dfsg/src/plugins/platforms/xcb/qxcbwindow.cpp
+@@ -1421,6 +1421,21 @@ void QXcbWindow::propagateSizeHints()
+ QSize sizeIncrement = windowSizeIncrement();
+
+ if (window()->isTopLevel() && minimumSize == maximumSize && !sizeIncrement.isEmpty()) {
++ // to use adjusted values at QXcbWindow::setGeometry
++ minimumSize = rect.size();
++
++ // to adjust values by sizeIncrement
++ if (minimumSize.width() % sizeIncrement.width() != 0) {
++ minimumSize.setWidth((minimumSize.width() / sizeIncrement.width() + 1) * sizeIncrement.width());
++ }
++
++ if (minimumSize.height() % sizeIncrement.height() != 0) {
++ minimumSize.setHeight((minimumSize.height() / sizeIncrement.height() + 1) * sizeIncrement.height());
++ }
++ maximumSize = minimumSize;
++ }
++
++ if (minimumSize.width() > 0 || minimumSize.height() > 0)
+ xcb_icccm_size_hints_set_min_size(&hints,
+ qMin(XCOORD_MAX,minimumSize.width()),
+ qMin(XCOORD_MAX,minimumSize.height()));