summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2020-04-20 17:01:34 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2020-04-21 06:20:23 +0000
commite4ba8327abd85f9d7dfdbfa8cd6ccbdb9dc9f050 (patch)
treef017f2e6bea56d3edb928ef79b64b51fd95467a8 /doc
parent756a9ca4ca2d0bc26ad8ffd75c0a2be399eb332c (diff)
downloadqt-creator-e4ba8327abd85f9d7dfdbfa8cd6ccbdb9dc9f050.tar.gz
Doc: Describe setting default line endings
For all projects or for the current project. Change-Id: Ie29c4ad42e62810a5c51e950b0d764e906308bda Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/qtcreator/images/qtcreator-editor-settings.pngbin70636 -> 23557 bytes
-rw-r--r--doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc11
-rw-r--r--doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc4
3 files changed, 13 insertions, 2 deletions
diff --git a/doc/qtcreator/images/qtcreator-editor-settings.png b/doc/qtcreator/images/qtcreator-editor-settings.png
index 81b4af6a39..0c5265a6a2 100644
--- a/doc/qtcreator/images/qtcreator-editor-settings.png
+++ b/doc/qtcreator/images/qtcreator-editor-settings.png
Binary files differ
diff --git a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
index bd5d5e2b56..56be275326 100644
--- a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
+++ b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -124,6 +124,15 @@
To switch between Windows line endings (CRLF) and Unix line endings (LF),
select the ending style on the editor toolbar (6).
+ To set the line endings to use for all projects by default, select
+ \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+ \uicontrol Behavior, and then select the ending style in the
+ \uicontrol {Default line endings} field.
+
+ To set the line endings to use for a project, select \uicontrol Projects >
+ \uicontrol {Project Settings} > \uicontrol Editor. For more information,
+ see \l {Specifying Editor Settings}.
+
\section1 Splitting the Editor View
Split the editor view or open the editor in a new window when you want to
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc
index a2f8c37480..5f8d6c6fb1 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -71,6 +71,8 @@
\li \l{File Encoding}
+ \li \l{Selecting Line Ending Style}
+
\li \l{Moving to Symbol Definition or Declaration}
\li \l{Configuring Fonts}