From c0408ed52ec84100167099d9e17c9458c77f5f5d Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 3 Nov 2020 17:59:19 +0100
Subject: [PATCH] Compile fixes with Qt 6

Change-Id: Ia5335bef6aeaff3ce12339db52d96793ff588824
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 .../qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp  | 2 +-
 src/plugins/clangcodemodel/clangfollowsymbol.cpp              | 4 ++--
 .../texteditor/codeassist/keywordscompletionassist.cpp        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
index cb77360252b..9d9c3ec8fab 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
@@ -89,7 +89,7 @@ void NodeInstanceSignalSpy::registerChildObject(const QMetaProperty &metaPropert
     if (metaProperty.isReadable()
             && !metaProperty.isWritable()
             && QmlPrivateGate::isPropertyQObject(metaProperty)
-            && QLatin1String(metaProperty.name()) != "parent") {
+            && QLatin1String(metaProperty.name()) != QLatin1String("parent")) {
         QObject *childObject = QmlPrivateGate::readQObjectProperty(metaProperty, spiedObject);
 
         if (childObject) {
diff --git a/src/plugins/clangcodemodel/clangfollowsymbol.cpp b/src/plugins/clangcodemodel/clangfollowsymbol.cpp
index 58adcacee2d..a6d856b2013 100644
--- a/src/plugins/clangcodemodel/clangfollowsymbol.cpp
+++ b/src/plugins/clangcodemodel/clangfollowsymbol.cpp
@@ -75,8 +75,8 @@ static bool isValidIncludePathToken(const ClangBackEnd::TokenInfoContainer &toke
     if (!token.extraInfo.includeDirectivePath)
         return false;
     const Utf8String &tokenName = token.extraInfo.token;
-    return !tokenName.startsWith("include") && tokenName != "<" && tokenName != ">"
-            && tokenName != "#";
+    return !tokenName.startsWith("include") && tokenName != Utf8String("<")
+            && tokenName != Utf8String(">") && tokenName != Utf8String("#");
 }
 
 static int includePathStartIndex(const QVector<ClangBackEnd::TokenInfoContainer> &marks,
diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
index bf9e591d7fa..b6cee71cde7 100644
--- a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
+++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
@@ -303,7 +303,7 @@ void pathComplete(const AssistInterface *interface, QList<AssistProposalItemInte
 
     // For pragmatic reasons, we don't support spaces in file names here.
     static const auto canOccurInFilePath = [](const QChar &c) {
-        return c.isLetterOrNumber() || c == '.' || c == '/' || c == "_" || c == '-';
+        return c.isLetterOrNumber() || c == '.' || c == '/' || c == '_' || c == '-';
     };
 
     int pos = interface->position();