diff options
| -rw-r--r-- | x11-toolkits/qt6-declarative/Makefile | 1 | ||||
| -rw-r--r-- | x11-toolkits/qt6-declarative/files/patch-src_qmlcompiler_qqmljsimportvisitor.cpp | 33 |
2 files changed, 34 insertions, 0 deletions
diff --git a/x11-toolkits/qt6-declarative/Makefile b/x11-toolkits/qt6-declarative/Makefile index bb9432d6a2fc..7c94487156b3 100644 --- a/x11-toolkits/qt6-declarative/Makefile +++ b/x11-toolkits/qt6-declarative/Makefile @@ -1,5 +1,6 @@ PORTNAME= declarative DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- diff --git a/x11-toolkits/qt6-declarative/files/patch-src_qmlcompiler_qqmljsimportvisitor.cpp b/x11-toolkits/qt6-declarative/files/patch-src_qmlcompiler_qqmljsimportvisitor.cpp new file mode 100644 index 000000000000..943fdf9f7134 --- /dev/null +++ b/x11-toolkits/qt6-declarative/files/patch-src_qmlcompiler_qqmljsimportvisitor.cpp @@ -0,0 +1,33 @@ +Upstream patch for the qmlcompiler crash +https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?h=6.9&id=672e6777e8e6a8fd86c7877075e7a8aa0ea0a31a + +--- src/qmlcompiler/qqmljsimportvisitor.cpp.orig 2025-05-28 20:21:26 UTC ++++ src/qmlcompiler/qqmljsimportvisitor.cpp +@@ -1041,16 +1041,17 @@ void QQmlJSImportVisitor::checkRequiredProperties() + : u"here"_s; + + 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); + } |