38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From abfb2bb0da2bc52a35a9a395d1a05ee3e35c68d0 Mon Sep 17 00:00:00 2001
|
||
From: Martchus <martchus@gmx.net>
|
||
Date: Mon, 12 Sep 2022 17:38:47 +0200
|
||
Subject: [PATCH 3/3] Fix compile error about missing QStringView overload
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Prevents the following compiler error:
|
||
```
|
||
/build/mingw-w64-qt6-activeqt/src/qtactiveqt-everywhere-src-6.3.2/tools/dumpcpp/main.cpp:599:41: error: no match for ‘operator+’ (operand types are ‘const QString’ and ‘QStringView’)
|
||
599 | moCode.insert(startType, ns + QStringView(u"::"));
|
||
| ~~ ^ ~~~~~~~~~~~~~~~~~~
|
||
| | |
|
||
| | QStringView
|
||
| const QString
|
||
```
|
||
---
|
||
tools/dumpcpp/main.cpp | 2 +-
|
||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
||
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
|
||
index 222aff0..53d2a18 100644
|
||
--- a/tools/dumpcpp/main.cpp
|
||
+++ b/tools/dumpcpp/main.cpp
|
||
@@ -570,7 +570,7 @@ bool generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray
|
||
const auto namespaceForTypeEntry = namespaceForType.constFind(type.toUtf8());
|
||
if (namespaceForTypeEntry != namespaceForType.constEnd()) {
|
||
const auto ns = QString::fromUtf8(namespaceForTypeEntry.value());
|
||
- moCode.insert(startType, ns + QStringView(u"::"));
|
||
+ moCode.insert(startType, ns + QStringLiteral("::"));
|
||
}
|
||
nextTypeAndForceComplete = startType + lengthType;
|
||
} while (true);
|
||
--
|
||
2.41.0
|
||
|