summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2013-11-15 14:29:48 +0100
committerLeena Miettinen <riitta-leena.miettinen@digia.com>2013-11-15 14:59:43 +0100
commita89a32c2b2f7c55a5edb71230439749e542542bc (patch)
treecf49e9538b2cbbbeb10062af755a687de44fc9e7
parente4ebad5eafdf81a4aab40258a7b098495cf66d53 (diff)
downloadqt-creator-a89a32c2b2f7c55a5edb71230439749e542542bc.tar.gz
Doc: Settings for binding pointers and references
Update screen shots. Change-Id: I0205792498150b2aabd11e12ee65e03fff3bf577 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
-rw-r--r--doc/images/qtcreator-code-style-alignment.pngbin9493 -> 40936 bytes
-rw-r--r--doc/images/qtcreator-code-style-braces.pngbin10183 -> 45665 bytes
-rw-r--r--doc/images/qtcreator-code-style-content.pngbin15962 -> 52962 bytes
-rw-r--r--doc/images/qtcreator-code-style-settings-edit-cpp.pngbin12453 -> 42961 bytes
-rw-r--r--doc/images/qtcreator-code-style-settings-edit-qtquick.pngbin11654 -> 33813 bytes
-rw-r--r--doc/images/qtcreator-code-style-switch.pngbin10639 -> 51423 bytes
-rw-r--r--doc/images/qtcreator-editortoolbar-symbols.pngbin65179 -> 85193 bytes
-rw-r--r--doc/images/qtcreator-pointers-references.pngbin0 -> 43790 bytes
-rw-r--r--doc/src/editors/creator-editors.qdoc15
9 files changed, 15 insertions, 0 deletions
diff --git a/doc/images/qtcreator-code-style-alignment.png b/doc/images/qtcreator-code-style-alignment.png
index 2f60c10fe7..19da87b4e8 100644
--- a/doc/images/qtcreator-code-style-alignment.png
+++ b/doc/images/qtcreator-code-style-alignment.png
Binary files differ
diff --git a/doc/images/qtcreator-code-style-braces.png b/doc/images/qtcreator-code-style-braces.png
index f2d9cf19e0..fdb6583476 100644
--- a/doc/images/qtcreator-code-style-braces.png
+++ b/doc/images/qtcreator-code-style-braces.png
Binary files differ
diff --git a/doc/images/qtcreator-code-style-content.png b/doc/images/qtcreator-code-style-content.png
index 6fd1089613..eec23e99a6 100644
--- a/doc/images/qtcreator-code-style-content.png
+++ b/doc/images/qtcreator-code-style-content.png
Binary files differ
diff --git a/doc/images/qtcreator-code-style-settings-edit-cpp.png b/doc/images/qtcreator-code-style-settings-edit-cpp.png
index 931211f532..ab4b48b5e5 100644
--- a/doc/images/qtcreator-code-style-settings-edit-cpp.png
+++ b/doc/images/qtcreator-code-style-settings-edit-cpp.png
Binary files differ
diff --git a/doc/images/qtcreator-code-style-settings-edit-qtquick.png b/doc/images/qtcreator-code-style-settings-edit-qtquick.png
index 563f092105..0063f69e59 100644
--- a/doc/images/qtcreator-code-style-settings-edit-qtquick.png
+++ b/doc/images/qtcreator-code-style-settings-edit-qtquick.png
Binary files differ
diff --git a/doc/images/qtcreator-code-style-switch.png b/doc/images/qtcreator-code-style-switch.png
index 5038c4f446..e197a7df79 100644
--- a/doc/images/qtcreator-code-style-switch.png
+++ b/doc/images/qtcreator-code-style-switch.png
Binary files differ
diff --git a/doc/images/qtcreator-editortoolbar-symbols.png b/doc/images/qtcreator-editortoolbar-symbols.png
index 8f55b277b7..b938086dce 100644
--- a/doc/images/qtcreator-editortoolbar-symbols.png
+++ b/doc/images/qtcreator-editortoolbar-symbols.png
Binary files differ
diff --git a/doc/images/qtcreator-pointers-references.png b/doc/images/qtcreator-pointers-references.png
new file mode 100644
index 0000000000..43dec0fb9c
--- /dev/null
+++ b/doc/images/qtcreator-pointers-references.png
Binary files differ
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index c45672634b..5b9a534bcc 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -1093,6 +1093,10 @@
\li Align continuation lines.
+ \li Bind pointers (*) and references (&) in types and declarations to
+ identifiers, type names, or left or right \c const or \c volatile
+ keywords.
+
\endlist
You can use the live preview to see how the options change the indentation.
@@ -1233,6 +1237,17 @@
\image qtcreator-code-style-alignment.png "Alignment options"
+ \section1 Binding Pointers and References
+
+ To bind pointers (*) and references (&) in types and declarations to
+ identifiers, type names, or left or right \c const or \c volatile keywords,
+ select the check boxes in the \gui {Pointers and References} tab.
+
+ The * and & characters are automatically bound to identifiers of pointers to
+ functions and pointers to arrays.
+
+ \image qtcreator-pointers-references.png "Pointers and References options"
+
*/