feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Compile fix with current Qt dev

Browse Source 
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: 6db23acc1f

Change-Id: Iac5df53547dc61b65b0d8c4087ca1f6366664b2f
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2022-04-11 18:23:42 +02:00
parent 3b5ef55a32
commit 06e3199e03
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/storagesettings.cpp
View File

@@ -72,7 +72,7 @@ QVariantMap StorageSettings::toMap() const
{addFinalNewLineKey, m_addFinalNewLine}, {addFinalNewLineKey, m_addFinalNewLine},
{cleanIndentationKey, m_cleanIndentation}, {cleanIndentationKey, m_cleanIndentation},
{skipTrailingWhitespaceKey, m_skipTrailingWhitespace}, {skipTrailingWhitespaceKey, m_skipTrailingWhitespace},
{ignoreFileTypesKey, m_ignoreFileTypes.toLatin1().data()} {ignoreFileTypesKey, m_ignoreFileTypes}
}; };
} }