openkylin
/
qtbase-opensource-src
mirror of https://gitee.com/openkylin/qtbase-opensource-src.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

update debian/changelog. 

Signed-off-by: hanpinlong <hanpinlong@kylinos.cn>
This commit is contained in:
hanpinlong 2023-06-19 06:57:25 +00:00 committed by cckylin-cibot
parent d862c62840
commit 914122c6b1
3 changed files with 151 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
qtbase-opensource-src (5.15.8+dfsg-ok1.7) yangtze; urgency=medium
* BUG号：
#I72AE6【显示器】连接投影仪扩展模式，锁屏、登录、电源管理界面均移位
* 需求号：无
* 其他更改：
-- hanpinlong <hanpinlong@kylinos.cn> Mon, 19 Jun 2023 14:57:14 +0800
qtbase-opensource-src (5.15.8+dfsg-ok1.6) yangtze; urgency=medium
* BUG号：

141
debian/patches/0034-update-debian-changelog.patch vendored Normal file
View File

@ -0,0 +1,141 @@
From: hanpinlong <hanpinlong@kylinos.cn>
Date: Mon, 19 Jun 2023 06:57:25 +0000
Subject: update debian/changelog.
Signed-off-by: hanpinlong <hanpinlong@kylinos.cn>
---
src/corelib/global/archdetect.cpp | 4 ++++
src/corelib/global/qprocessordetection.h | 7 +++++++
src/gui/kernel/qhighdpiscaling.cpp | 13 +++----------
src/gui/kernel/qhighdpiscaling_p.h | 4 ++--
src/gui/kernel/qscreen.cpp | 6 ++++++
src/gui/painting/qtransform.cpp | 2 +-
6 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/corelib/global/archdetect.cpp b/src/corelib/global/archdetect.cpp
index 1d00b7f..8ca6efe 100644
--- a/src/corelib/global/archdetect.cpp
+++ b/src/corelib/global/archdetect.cpp
@@ -59,6 +59,10 @@
# define ARCH_PROCESSOR "x86_64"
#elif defined(Q_PROCESSOR_IA64)
# define ARCH_PROCESSOR "ia64"
+#elif defined(Q_PROCESSOR_LOONGARCH_64)
+# define ARCH_PROCESSOR "loongarch64"
+#elif defined(Q_PROCESSOR_LOONGARCH)
+# define ARCH_PROCESSOR "loongarch"
#elif defined(Q_PROCESSOR_MIPS_64)
# define ARCH_PROCESSOR "mips64"
#elif defined(Q_PROCESSOR_MIPS)
diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h
index a6ead54..2a0382c 100644
--- a/src/corelib/global/qprocessordetection.h
+++ b/src/corelib/global/qprocessordetection.h
@@ -228,6 +228,13 @@
# define Q_PROCESSOR_WORDSIZE 8
// Q_BYTE_ORDER not defined, use endianness auto-detection
+#elif defined(_loongarch) || defined(__loongarch__)
+# define Q_PROCESSOR_LOONGARCH
+# if defined(__loongarch64)
+# define Q_PROCESSOR_LOONGARCH_64
+# define Q_PROCESSOR_WORDSIZE 8
+# endif
+
/*
MIPS family, known revisions: I, II, III, IV, 32, 64
diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp
index 9bbf277..dfe0ee9 100644
--- a/src/gui/kernel/qhighdpiscaling.cpp
+++ b/src/gui/kernel/qhighdpiscaling.cpp
@@ -396,10 +396,7 @@ qreal QHighDpiScaling::roundScaleFactor(qreal rawFactor)
}
// Check application object if no environment value was set.
- if (scaleFactorRoundingPolicy == Qt::HighDpiScaleFactorRoundingPolicy::Unset) {
- scaleFactorRoundingPolicy = QGuiApplication::highDpiScaleFactorRoundingPolicy();
- } else {
- // Make application setting reflect environment
+ if (scaleFactorRoundingPolicy != Qt::HighDpiScaleFactorRoundingPolicy::Unset) {
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(scaleFactorRoundingPolicy);
}
}
@@ -460,8 +457,6 @@ QDpi QHighDpiScaling::effectiveLogicalDpi(const QPlatformScreen *screen, qreal r
policyText.constData(), values.constData());
}
}
- if (dpiAdjustmentPolicy == DpiAdjustmentPolicy::Unset)
- dpiAdjustmentPolicy = DpiAdjustmentPolicy::UpOnly;
}
// Apply adjustment policy.
@@ -539,7 +534,7 @@ void QHighDpiScaling::updateHighDpiScaling()
++i;
}
}
- m_active = m_globalScalingActive || m_screenFactorSet || m_pixelDensityScalingActive;
+ m_active = m_globalScalingActive || m_usePixelDensity;
}
/*
@@ -684,9 +679,7 @@ QDpi QHighDpiScaling::logicalDpi(const QScreen *screen)
return QDpi(96, 96);
if (!m_usePixelDensity) {
- const qreal screenScaleFactor = screenSubfactor(screen->handle());
- const QDpi dpi = QPlatformScreen::overrideDpi(screen->handle()->logicalDpi());
- return QDpi{ dpi.first / screenScaleFactor, dpi.second / screenScaleFactor };
+ return screen->handle()->logicalDpi();
}
const qreal scaleFactor = rawScaleFactor(screen->handle());
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h
index 5b02c5d..e4714c9 100644
--- a/src/gui/kernel/qhighdpiscaling_p.h
+++ b/src/gui/kernel/qhighdpiscaling_p.h
@@ -159,12 +159,12 @@ inline QVector2D scale(const QVector2D &value, qreal scaleFactor, QPointF /* ori
inline QPointF scale(const QPointF &pos, qreal scaleFactor, QPointF origin = QPointF(0, 0))
{
- return (pos - origin) * scaleFactor + origin;
+ return (pos - origin) * scaleFactor + origin * scaleFactor;
}
inline QPoint scale(const QPoint &pos, qreal scaleFactor, QPoint origin = QPoint(0, 0))
{
- return (pos - origin) * scaleFactor + origin;
+ return (pos - origin) * scaleFactor + origin * scaleFactor;
}
inline QRect scale(const QRect &rect, qreal scaleFactor, QPoint origin = QPoint(0, 0))
diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
index 8e0eb35..3bceaf2 100644
--- a/src/gui/kernel/qscreen.cpp
+++ b/src/gui/kernel/qscreen.cpp
@@ -410,6 +410,12 @@ QSize QScreen::availableSize() const
QRect QScreen::geometry() const
{
Q_D(const QScreen);
+
+ if (d->platformScreen)
+ {
+ return QHighDpi::fromNativePixels(d->platformScreen->geometry(), this);
+ }
+
return d->geometry;
}
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index e86aff1..9d281f6 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -1568,7 +1568,7 @@ QRegion QTransform::map(const QRegion &r) const
}
QPainterPath p = map(qt_regionToPath(r));
- return p.toFillPolygon(QTransform()).toPolygon();
+ return p.toFillPolygon().toPolygon();
}
struct QHomogeneousCoordinate

1
debian/patches/series vendored
View File

@ -31,3 +31,4 @@ revert_startBlocking_removal.diff
0031-10-changelog.patch
0032-13-rebuild.patch
0033-update-debian-changelog.patch
0034-update-debian-changelog.patch