diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-05-27 11:35:27 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-05-27 11:45:32 +0300 |
| commit | 3946e2f8607282e054a76b119f1819b2535a0b8a (patch) | |
| tree | f74144f8c5a1c4889bf81c89622567f564571fc8 /doc | |
| parent | 8c448f77a00d01e24e4d083d9684c275b3efdd04 (diff) | |
| parent | 6ea22a1a9ef9d9be25e09740aa72bb0a5dfebfc7 (diff) | |
Merge remote-tracking branch 'origin/3.1' into master
Change-Id: I65e3ed3858cda954a5f916031d4ff02a39a9aa87
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/installerfw.qdoc | 5 | ||||
| -rw-r--r-- | doc/operations.qdoc | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index 0589c8c14..09c7e575a 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -585,7 +585,10 @@ Translations may be specified similarly to DisplayName tag. If a localization that matches the locale is not found and an untranslated version exists, that one will be used. Otherwise no Description will be - shown for that locale. + shown for that locale. User clickable external links, for example a component's + homepage, can be included in component description by specifying a URL + address like this: {external-link}='https://www.qt.io/'. The URL must be valid + and contain a full path to the desired resource. \row \li Version \li Version number of the component in the following format: diff --git a/doc/operations.qdoc b/doc/operations.qdoc index 9cba0d618..85a17a581 100644 --- a/doc/operations.qdoc +++ b/doc/operations.qdoc @@ -174,8 +174,8 @@ \note The operation is using QSettings to store the key value pair. QSettings always treats backslash as a special character and provides no API for reading - or writing such entries. Do not use slashes ('/' and '\') in section or key names; - the backslash character is used to separate sub keys. On windows, '\' are converted + or writing such entries. Do not use slashes ('/' and '\\') in section or key names; + the backslash character is used to separate sub keys. On windows, '\\' are converted by QSettings to '/', which makes them identical. Because the backslash character is used by QSettings to separate sub keys, you cannot read or write windows registry entries that contain slashes or backslashes. You should use a native windows API if |