From 0368b02559793da268bc29613147231d82039772 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Tue, 6 Oct 2020 16:53:17 +0200
Subject: [PATCH] Doc: Remove outdated info about default encoding

The Default encoding field now seems to correctly display
UTF-8.

Added a screenshot.

Task-number: QTCREATORBUG-24529
Change-Id: I2d7b240f9862afeb05c1ac359efe262206569235
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 ...ptions-texteditor-behavior-file-encodings.png | Bin 0 -> 3006 bytes
 .../editors/creator-editors-options-text.qdoc    |   7 +++----
 2 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 doc/qtcreator/images/qtcreator-options-texteditor-behavior-file-encodings.png

diff --git a/doc/qtcreator/images/qtcreator-options-texteditor-behavior-file-encodings.png b/doc/qtcreator/images/qtcreator-options-texteditor-behavior-file-encodings.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fc01471952581ed07a7af427af62ac9e5c7414a
GIT binary patch
literal 3006
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
Bt406-

literal 0
HcmV?d00001

diff --git a/doc/qtcreator/src/editors/creator-editors-options-text.qdoc b/doc/qtcreator/src/editors/creator-editors-options-text.qdoc
index bfee108f3c4..8414fe8cfe2 100644
--- a/doc/qtcreator/src/editors/creator-editors-options-text.qdoc
+++ b/doc/qtcreator/src/editors/creator-editors-options-text.qdoc
@@ -97,11 +97,10 @@
     \uicontrol Options > \uicontrol {Text Editor} > \uicontrol Behavior, and
     then select a suitable option in \uicontrol {Default encoding}.
 
-    Qt 5 requires UTF-8 encoded source files, and therefore the default encoding
-    was changed from \uicontrol System to \uicontrol UTF-8 in \QC version 2.6.
-    However, the \uicontrol {Default encoding} field still displays the value
-    \uicontrol System if the default system encoding is set to UTF-8.
+    \image qtcreator-options-texteditor-behavior-file-encodings.png "File encoding options"
 
+    Qt 5 and Qt 6 require UTF-8 encoded source files, and therefore the default
+    encoding is set to \uicontrol UTF-8.
     Detecting the correct encoding is tricky, so \QC will not try to do so.
     Instead, it displays the following error message when you try to edit a file
     that is not UTF-8 encoded: \uicontrol {Error: Could not decode "filename" with