diff options
| -rw-r--r-- | doc/src/editors/creator-editors.qdoc | 56 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljsstaticanalysismessage.cpp | 14 |
2 files changed, 63 insertions, 7 deletions
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index 975de5d5b14..6f89e849e54 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -529,6 +529,56 @@ \li \row + \li M208 + \li Error + \li This type (%1) is not supported as a root element by \QMLD. + \li + + \row + \li M220 + \li Error + \li This type (%1) is not supported as a root element of a Qt Quick UI + form. + \li + + \row + \li M221 + \li Error + \li This type (%1) is not supported in a Qt Quick UI form. + \li + + \row + \li M222 + \li Error + \li Functions are not supported in a Qt Quick UI form. + \li + + \row + \li M223 + \li Error + \li Java Script blocks are not supported in a Qt Quick UI form. + \li + + \row + \li M224 + \li Error + \li Behavior type is not supported in a Qt Quick UI form. + \li + + \row + \li M225 + \li Error + \li States are only supported in the root item in a Qt Quick UI form. + \li + + \row + \li M226 + \li Error + \li Referencing the parent of the root item is not supported in a Qt + Quick UI form. + \li + + \row \li M300 \li Error \li Unknown component @@ -671,6 +721,12 @@ \li 'Number' elements expected in array value \li + \row + \li M324 + \li Warning + \li Using Qt Quick 1 code model instead of Qt Quick 2 + \li + \endtable */ diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.cpp b/src/libs/qmljs/qmljsstaticanalysismessage.cpp index dd8c4098dd3..01a09a00b2f 100644 --- a/src/libs/qmljs/qmljsstaticanalysismessage.cpp +++ b/src/libs/qmljs/qmljsstaticanalysismessage.cpp @@ -225,19 +225,19 @@ StaticAnalysisMessages::StaticAnalysisMessages() newMsg(ErrUnsupportedRootTypeInVisualDesigner, Error, tr("This type (%1) is not supported as a root element by Qt Quick Designer."), 1); newMsg(ErrUnsupportedRootTypeInQmlUi, Error, - tr("This type (%1) is not supported as a root element of a Qt Quick ui file."), 1); + tr("This type (%1) is not supported as a root element of a Qt Quick UI form."), 1); newMsg(ErrUnsupportedTypeInQmlUi, Error, - tr("This type (%1) is not supported in a Qt Quick ui file."), 1); + tr("This type (%1) is not supported in a Qt Quick UI form."), 1); newMsg(ErrFunctionsNotSupportedInQmlUi, Error, - tr("Functions are not supported in a Qt Quick ui file.")); + tr("Functions are not supported in a Qt Quick UI form.")); newMsg(ErrBlocksNotSupportedInQmlUi, Error, - tr("Java Script blocks are not supported in a Qt Quick ui file.")); + tr("Java Script blocks are not supported in a Qt Quick UI form.")); newMsg(ErrBehavioursNotSupportedInQmlUi, Error, - tr("Behaviours are not supported in a Qt Quick ui file.")); + tr("Behavior type is not supported in a Qt Quick UI form.")); newMsg(ErrStatesOnlyInRootItemInQmlUi, Error, - tr("States are only supported in the root item in a Qt Quick ui file.")); + tr("States are only supported in the root item in a Qt Quick UI form.")); newMsg(ErrReferenceToParentItemNotSupportedInQmlUi, Error, - tr("Referencing the parent of the root item is not supported in a Qt Quick ui file.")); + tr("Referencing the parent of the root item is not supported in a Qt Quick UI form.")); } } // anonymous namespace |