Merge remote-tracking branch 'origin/qds-1.59'

Conflicts:
	src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
	src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp

Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68

src/libs/qmljs/qmljscheck.cpp

@@ -942,6 +942,9 @@ void Check::visitQmlObject(Node *ast, UiQualifiedId *typeId,
     if (checkTypeForDesignerSupport(typeId))
         addMessage(WarnUnsupportedTypeInVisualDesigner, typeErrorLocation, typeName);
 
+    if (QFileInfo(_doc->fileName()).baseName() == getRightMostIdentifier(typeId)->name.toString())
+        addMessage(ErrTypeIsInstantiatedRecursively, typeErrorLocation, typeName);
+
     if (checkTypeForQmlUiSupport(typeId))
         addMessage(ErrUnsupportedTypeInQmlUi, typeErrorLocation, typeName);
 

src/libs/qmljs/qmljsstaticanalysismessage.cpp

@@ -245,6 +245,8 @@ StaticAnalysisMessages::StaticAnalysisMessages()
            tr("Duplicate import (%1)."), 1);
     newMsg(ErrHitMaximumRecursion, Error,
            tr("Hit maximum recursion limit when visiting AST."));
+    newMsg(ErrTypeIsInstantiatedRecursively, Error,
+            tr("Type cannot be instantiated  recursively (%1)."), 1);
 }
 
 } // anonymous namespace

src/libs/qmljs/qmljsstaticanalysismessage.h

@@ -89,6 +89,7 @@ enum Type
     MaybeWarnEqualityTypeCoercion = 126,
     WarnConfusingExpressionStatement = 127,
     StateCannotHaveChildItem = 128,
+    ErrTypeIsInstantiatedRecursively = 129,
     HintDeclarationsShouldBeAtStartOfFunction = 201,
     HintOneStatementPerLine = 202,
     WarnImperativeCodeNotEditableInVisualDesigner = 203,