From 06e3199e03107029c3e7c3895fba23187a42f7bf Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 11 Apr 2022 18:23:42 +0200
Subject: [PATCH] TextEditor: Compile fix with current Qt dev
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Most likely some .pch / NO_CAST_FROM_ASCII problem somewhere, but I got

  src/plugins/texteditor/storagesettings.cpp: In member function ‘QVariantMap TextEditor::StorageSettings::toMap() const’:
  src/plugins/texteditor/storagesettings.cpp:76:5: error: use of deleted function ‘QVariant::QVariant(T) [with T = char*; typename std::enable_if<disjunction_v<std::is_pointer<_Tp>, std::is_member_pointer<_Tp> >, bool>::type <anonymous> = false]’
   76 |

and the char * conversion seems wrong in any case.

Cherry-picked from: 6db23acc1f765a38cc13b5a92b31482b09ec132a

Change-Id: Iac5df53547dc61b65b0d8c4087ca1f6366664b2f
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/texteditor/storagesettings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/texteditor/storagesettings.cpp b/src/plugins/texteditor/storagesettings.cpp
index cd58a453a54..498f0655ec8 100644
--- a/src/plugins/texteditor/storagesettings.cpp
+++ b/src/plugins/texteditor/storagesettings.cpp
@@ -72,7 +72,7 @@ QVariantMap StorageSettings::toMap() const
         {addFinalNewLineKey, m_addFinalNewLine},
         {cleanIndentationKey, m_cleanIndentation},
         {skipTrailingWhitespaceKey, m_skipTrailingWhitespace},
-        {ignoreFileTypesKey, m_ignoreFileTypes.toLatin1().data()}
+        {ignoreFileTypesKey, m_ignoreFileTypes}
     };
 }