Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt6-declarative rebuild

Browse Source
This commit is contained in:
Rmys
2025-07-24 12:01:42 +03:00
parent 1ffeeaa577
commit 64dfb9daf5
3 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt6/qt6-declarative/files/qtdeclarative-6.9.1-QTBUG-135158.patch
+14
View File
@@ -0,0 +1,14 @@
https://bugreports.qt.io/browse/QTBUG-135158
https://codereview.qt-project.org/c/qt/qtdeclarative/+/647212
--- a/src/quicktemplates/qquickpopuppositioner.cpp
+++ b/src/quicktemplates/qquickpopuppositioner.cpp
@@ -321,5 +321,8 @@
: p->parentItem->mapToGlobal(windowPos.x(), windowPos.y());
QRectF rect = { globalCoords.x(), globalCoords.y(), popupItem->width(), popupItem->height() };
- if (!skipFittingStep) {
+
+ // QTBUG-99618: On wayland, we can't use QWindow::mapToGlobal(), and should use a xdg_positioner instead.
+ static bool isWayland = QGuiApplication::platformName().startsWith(QLatin1String("wayland"));
+ if (!skipFittingStep && !isWayland) {
const QScreen *screenAtPopupPosition = QGuiApplication::screenAt(globalCoords.toPoint());
const QScreen *screen = screenAtPopupPosition ? screenAtPopupPosition : QGuiApplication::primaryScreen();
desktop/toolkit/qt6/qt6-declarative/files/qtdeclarative-6.9.1-qmlcachegen-crash.patch
+32
View File
@@ -0,0 +1,32 @@
https://bugreports.qt.io/browse/QTBUG-136998
https://bugreports.qt.io/browse/QTBUG-137196
https://bugreports.qt.io/browse/QTBUG-137411
https://github.com/qt/qtdeclarative/commit/672e6777e8e6a8fd86c7877075e7a8aa0ea0a31a
--- a/src/qmlcompiler/qqmljsimportvisitor.cpp
+++ b/src/qmlcompiler/qqmljsimportvisitor.cpp
@@ -1042,14 +1042,15 @@
if (!prevRequiredScope.isNull()) {
- auto sourceScope = prevRequiredScope->baseType();
- suggestion = QQmlJSFixSuggestion{
- "%1:%2:%3: Property marked as required in %4."_L1
- .arg(sourceScope->filePath())
- .arg(sourceScope->sourceLocation().startLine)
- .arg(sourceScope->sourceLocation().startColumn)
- .arg(requiredScopeName),
- sourceScope->sourceLocation()
- };
- suggestion->setFilename(sourceScope->filePath());
+ if (auto sourceScope = prevRequiredScope->baseType()) {
+ suggestion = QQmlJSFixSuggestion{
+ "%1:%2:%3: Property marked as required in %4."_L1
+ .arg(sourceScope->filePath())
+ .arg(sourceScope->sourceLocation().startLine)
+ .arg(sourceScope->sourceLocation().startColumn)
+ .arg(requiredScopeName),
+ sourceScope->sourceLocation()
+ };
+ suggestion->setFilename(sourceScope->filePath());
+ }
} else {
message += " (marked as required by %1)"_L1.arg(requiredScopeName);
desktop/toolkit/qt6/qt6-declarative/pspec.xml
+9 -1
View File
@@ -29,7 +29,8 @@
<Dependency versionFrom="6.9.1">qt6-languageserver-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">qtdeclarative-qmlcompiler-error-out-on-unstorable-types.patch</Patch> -->
<Patch level="1">qtdeclarative-6.9.1-QTBUG-135158.patch</Patch>
<Patch level="1">qtdeclarative-6.9.1-qmlcachegen-crash.patch</Patch>
</Patches>
</Source>
<Package>
@@ -72,6 +73,13 @@
</Files>
</Package-->
<History>
<Update release="16">
<Date>2025-07-24</Date>
<Version>6.9.1</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="15">
<Date>2025-06-09</Date>
<Version>6.9.1</Version>