Merge remote-tracking branch 'origin/8.0'

Conflicts:
	src/libs/utils/terminalprocess.cpp
	tests/auto/qml/qmldesigner/coretests/CMakeLists.txt

Change-Id: Ifc5b37dadd46af752f0771a2685da1ac9a6260bd

src/plugins/qmljseditor/qmljsquickfixassist.h

@@ -45,6 +45,7 @@ public:
 
     const QmlJSTools::SemanticInfo &semanticInfo() const;
     QmlJSTools::QmlJSRefactoringFilePtr currentFile() const;
+    bool isBaseObject() const override { return false; }
 
 private:
     QmlJSTools::SemanticInfo m_semanticInfo;