qt6-declarative rebuild
This commit is contained in:
@@ -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();
|
||||||
@@ -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);
|
||||||
@@ -29,7 +29,8 @@
|
|||||||
<Dependency versionFrom="6.9.1">qt6-languageserver-devel</Dependency>
|
<Dependency versionFrom="6.9.1">qt6-languageserver-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<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>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
<Package>
|
<Package>
|
||||||
@@ -72,6 +73,13 @@
|
|||||||
</Files>
|
</Files>
|
||||||
</Package-->
|
</Package-->
|
||||||
<History>
|
<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">
|
<Update release="15">
|
||||||
<Date>2025-06-09</Date>
|
<Date>2025-06-09</Date>
|
||||||
<Version>6.9.1</Version>
|
<Version>6.9.1</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user