This commit is contained in:
parent
e6db78b44d
commit
f6a8bd4cb1
@ -1,4 +1,4 @@
|
|||||||
From 1799ab7360b1ae33dcfc5b173acb5822028c9aca Mon Sep 17 00:00:00 2001
|
From e6e3da4de8fac7f52eb2591cb95a04ab413f8ace Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Olivier=20De=20Canni=C3=A8re?= <olivier.decanniere@qt.io>
|
From: =?UTF-8?q?Olivier=20De=20Canni=C3=A8re?= <olivier.decanniere@qt.io>
|
||||||
Date: Wed, 9 Oct 2024 09:41:27 +0200
|
Date: Wed, 9 Oct 2024 09:41:27 +0200
|
||||||
Subject: [PATCH] Compiler: Wrap raw string literals in QStringLiteral in
|
Subject: [PATCH] Compiler: Wrap raw string literals in QStringLiteral in
|
||||||
@ -6,15 +6,17 @@ Subject: [PATCH] Compiler: Wrap raw string literals in QStringLiteral in
|
|||||||
|
|
||||||
Amends e7146cd98700c29802214a39a4cefd9db146c97a
|
Amends e7146cd98700c29802214a39a4cefd9db146c97a
|
||||||
|
|
||||||
Pick-to: 6.8
|
|
||||||
Fixes: QTBUG-129797
|
Fixes: QTBUG-129797
|
||||||
Change-Id: I5dc48412cf29bd2de877dd681ea309a6e74d75c5
|
Change-Id: I5dc48412cf29bd2de877dd681ea309a6e74d75c5
|
||||||
|
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
||||||
|
(cherry picked from commit d63c560ec4ce79c1bb24e1a01a20de41706dd039)
|
||||||
|
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||||
---
|
---
|
||||||
src/qmlcompiler/qqmljscodegenerator.cpp | 8 ++++----
|
src/qmlcompiler/qqmljscodegenerator.cpp | 8 ++++----
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/qmlcompiler/qqmljscodegenerator.cpp b/src/qmlcompiler/qqmljscodegenerator.cpp
|
diff --git a/src/qmlcompiler/qqmljscodegenerator.cpp b/src/qmlcompiler/qqmljscodegenerator.cpp
|
||||||
index 807168c..e5622fe 100644
|
index 807168ca09..e5622fe6f9 100644
|
||||||
--- a/src/qmlcompiler/qqmljscodegenerator.cpp
|
--- a/src/qmlcompiler/qqmljscodegenerator.cpp
|
||||||
+++ b/src/qmlcompiler/qqmljscodegenerator.cpp
|
+++ b/src/qmlcompiler/qqmljscodegenerator.cpp
|
||||||
@@ -77,16 +77,16 @@ QString QQmlJSCodeGenerator::compositeListMetaType(const QString &elementName) c
|
@@ -77,16 +77,16 @@ QString QQmlJSCodeGenerator::compositeListMetaType(const QString &elementName) c
|
||||||
@ -39,5 +41,5 @@ index 807168c..e5622fe 100644
|
|||||||
|
|
||||||
QString QQmlJSCodeGenerator::metaObject(const QQmlJSScope::ConstPtr &objectType)
|
QString QQmlJSCodeGenerator::metaObject(const QQmlJSScope::ConstPtr &objectType)
|
||||||
--
|
--
|
||||||
2.46.1
|
2.47.0
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user