diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.9.1-qmlcachegen-crash.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.9.1-qmlcachegen-crash.patch
new file mode 100644
index 0000000000000..f3a0b70e00b0e
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-6.9.1-qmlcachegen-crash.patch
@@ -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);
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9.1-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9.1-r2.ebuild
similarity index 97%
rename from dev-qt/qtdeclarative/qtdeclarative-6.9.1-r1.ebuild
rename to dev-qt/qtdeclarative/qtdeclarative-6.9.1-r2.ebuild
index 2b9c1ea26d3eb..92bff90f26246 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.9.1-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.9.1-r2.ebuild
@@ -34,6 +34,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.9.1-QTBUG-135158.patch
+	"${FILESDIR}"/${PN}-6.9.1-qmlcachegen-crash.patch
 )
 
 src_configure() {