diff options
author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2022-02-15 11:54:57 +0100 |
---|---|---|
committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2022-02-18 07:33:35 +0000 |
commit | d4871103511e46759738487b41b4bb1b6cfb1a22 (patch) | |
tree | 267249c9a5c8bde6a5308e40b4b610a591b17da0 /doc | |
parent | 1f3e6b4c7a1f45ce9562a0e536daed8440653248 (diff) |
QML/JS: Fix terminology in messages
- Replace Qt Quick Designer with Qt Design Studio
- Replace "Qt Quick UI form" with "UI file (.ui.qml)"
Also fix the docs:
- Add missing messages
- Hide QDS messages from Qt Creator Manual
- Make punctuation consistent
- Add some links to more information
Task-number: QDS-2670
Task-number: QTCREATORBUG-27055
Change-Id: Id90f1ad82e7297f91225bc8d650a9578ba071330
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/qtcreator/src/editors/creator-code-syntax.qdoc | 72 | ||||
-rw-r--r-- | doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc | 8 |
2 files changed, 59 insertions, 21 deletions
diff --git a/doc/qtcreator/src/editors/creator-code-syntax.qdoc b/doc/qtcreator/src/editors/creator-code-syntax.qdoc index 65e41022e3..f54337dd90 100644 --- a/doc/qtcreator/src/editors/creator-code-syntax.qdoc +++ b/doc/qtcreator/src/editors/creator-code-syntax.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -291,7 +291,7 @@ \row \li M106 \li Warning - \li \c Name is already a var + \li \c Name already is a var \li \row @@ -417,6 +417,12 @@ \li \row + \li M129 + \li Error + \li Type cannot be instantiated recursively + \li + + \row \li M201 \li Hint \li Place var declarations at the start of a function @@ -430,6 +436,7 @@ \li Use only one statement per line \li + \if defined(qtdesignstudio) \row \li M203 \li Warning @@ -463,60 +470,70 @@ \row \li M208 \li Error - \li This id might be ambiguous and is not supported in \QDS. + \li This id might be ambiguous and is not supported in \QDS \li \row \li M209 \li Error \li This type (type name) is not supported as a root element in - \QDS. + \QDS \li + \endif \row \li M220 \li Error \li This type (type name) is not supported as a root element of a - UI file (.ui.qml). - \li + UI file (.ui.qml) + \li For more information about supported QML types, see \l{UI Files}. \row \li M221 \li Error - \li This type (type name) is not supported in a UI file (.ui.qml). - \li + \li This type (type name) is not supported in a UI file (.ui.qml) + \li For more information about supported QML types, see \l{UI Files}. \row \li M222 \li Error - \li Functions are not supported in a UI file (.ui.qml). + \li Functions are not supported in a UI file (.ui.qml) \li For a list of supported JavaScript functions, see \l{Supported Methods}. \row \li M223 \li Error - \li Java Script blocks are not supported in a UI file (.ui.qml). - \li + \li JavaScript blocks are not supported in a UI file (.ui.qml) + \li For more information about supported features, see \l{UI Files}. \row \li M224 \li Error - \li Behavior type is not supported in a UI file (.ui.qml). - \li + \li Behavior type is not supported in a UI file (.ui.qml) + \li For more information about supported QML types, see \l{UI Files}. \row \li M225 \li Error - \li States are only supported in the root item in a UI file (.ui.qml). - \li + \li States are only supported in the root item in a UI file (.ui.qml) + \li For more information about supported features, see \l{UI Files}. \row \li M226 \li Error \li Referencing the parent of the root item is not supported in a - UI file (.ui.qml). - \li + UI file (.ui.qml) + \li For more information about supported features, see \l{UI Files}. + + \row + \li M227 + \li Error + \li Do not mix translation functions in a UI file (.ui.qml) + \li Even though several different translation functions, such as + \c qsTr and \c qsTrId are supported, you should pick one and + use it consistently within a UI file. For more information, + see \l{Qt QML Methods}. \row \li M300 @@ -675,10 +692,29 @@ \li \row + \li M325 + \li Warning + \li Logical value does not depend on actual values + \li + + \row + \li M326 + \li Error + \li Components are only allowed to have a single child element + \li For more information, see \l [QML] {Component}. + + \row + \li M327 + \li Warning + \li Components require a child element + \li For more information, see \l [QML] {Component}. + + \row \li M400 \li Warning \li Duplicate import - \li + \li An import statement has been added twice. For more information, + see \l{Import Statements}. \endtable diff --git a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc index fb76d5250c..a21991f7ba 100644 --- a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -52,6 +52,7 @@ be edited in \QDS only. \endif + The following features are not supported in .ui.qml files: \list @@ -61,6 +62,7 @@ \li States in other components than the root component \li Root components that are not derived from \l QQuickItem or \l [QML]{Item} + \li Referencing the parent of the root component \endlist The following components are not supported: @@ -69,11 +71,9 @@ \li Behavior \li Binding \li Canvas - \li Component \li Shader Effect \li Timer \li Transform - \li Transition \endlist \section1 Supported Methods @@ -165,6 +165,8 @@ \li \l{Qt::}{qsTrNoOp()} \endlist + \note Do not mix translation methods in a UI file. + For more information about using the methods, see \l{https://doc.qt.io/qt/qml-qtqml-qt.html}{Qt QML Methods}. |