diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 05273c579ae..5fadd84cd3b 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -675,7 +675,7 @@ QList Check::defaultDisabledMessagesForNonQuickUi() ErrBehavioursNotSupportedInQmlUi, ErrStatesOnlyInRootItemInQmlUi, ErrReferenceToParentItemNotSupportedInQmlUi, - ErrDoNotMixTranslationFunctionsInQmlUi, + WarnDoNotMixTranslationFunctionsInQmlUi, }); return disabled; } @@ -774,7 +774,7 @@ void Check::enableQmlDesignerUiFileChecks() enableMessage(ErrBehavioursNotSupportedInQmlUi); enableMessage(ErrStatesOnlyInRootItemInQmlUi); enableMessage(ErrReferenceToParentItemNotSupportedInQmlUi); - enableMessage(ErrDoNotMixTranslationFunctionsInQmlUi); + enableMessage(WarnDoNotMixTranslationFunctionsInQmlUi); } void Check::disableQmlDesignerUiFileChecks() @@ -786,7 +786,7 @@ void Check::disableQmlDesignerUiFileChecks() disableMessage(ErrBehavioursNotSupportedInQmlUi); disableMessage(ErrStatesOnlyInRootItemInQmlUi); disableMessage(ErrReferenceToParentItemNotSupportedInQmlUi); - disableMessage(ErrDoNotMixTranslationFunctionsInQmlUi); + disableMessage(WarnDoNotMixTranslationFunctionsInQmlUi); } bool Check::preVisit(Node *ast) @@ -1937,7 +1937,7 @@ bool Check::visit(CallExpression *ast) if (lastTransLationfunction != noTranslationfunction && lastTransLationfunction != translationFunction) - addMessage(ErrDoNotMixTranslationFunctionsInQmlUi, location); + addMessage(WarnDoNotMixTranslationFunctionsInQmlUi, location); lastTransLationfunction = translationFunction; } diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.cpp b/src/libs/qmljs/qmljsstaticanalysismessage.cpp index ef24d648c41..98bff3a4b69 100644 --- a/src/libs/qmljs/qmljsstaticanalysismessage.cpp +++ b/src/libs/qmljs/qmljsstaticanalysismessage.cpp @@ -218,7 +218,8 @@ StaticAnalysisMessages::StaticAnalysisMessages() Tr::tr("States are only supported in the root item in a UI file (.ui.qml).")); newMsg(ErrReferenceToParentItemNotSupportedInQmlUi, Error, Tr::tr("Referencing the parent of the root item is not supported in a UI file (.ui.qml).")); - newMsg(ErrDoNotMixTranslationFunctionsInQmlUi, Error, + newMsg(WarnDoNotMixTranslationFunctionsInQmlUi, + Warning, Tr::tr("Do not mix translation functions in a UI file (.ui.qml).")); newMsg(StateCannotHaveChildItem, Error, Tr::tr("A State cannot have a child item (%1)."), 1); diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.h b/src/libs/qmljs/qmljsstaticanalysismessage.h index 404eb1676c8..01b3b52d698 100644 --- a/src/libs/qmljs/qmljsstaticanalysismessage.h +++ b/src/libs/qmljs/qmljsstaticanalysismessage.h @@ -83,7 +83,7 @@ enum Type { ErrBehavioursNotSupportedInQmlUi = 224, ErrStatesOnlyInRootItemInQmlUi = 225, ErrReferenceToParentItemNotSupportedInQmlUi = 226, - ErrDoNotMixTranslationFunctionsInQmlUi = 227, + WarnDoNotMixTranslationFunctionsInQmlUi = 227, ErrUnknownComponent = 300, ErrCouldNotResolvePrototypeOf = 301, ErrCouldNotResolvePrototype = 302,