Merge remote-tracking branch 'origin/5.0'

Conflicts: src/libs/utils/processreaper.cpp src/plugins/clangcodemodel/clangmodelmanagersupport.cpp src/plugins/cmakeprojectmanager/cmakeprocess.cpp Change-Id: Ie248bcb02a80f3e02ab19d73033ce2ba31e7fd83
2021-09-07 08:56:42 +02:00
parent d739ba8a7d 93857c279c
commit 8e51295959
101 changed files with 1050 additions and 663 deletions
--- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
+++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
@@ -73,6 +73,7 @@ public:
        if (!m_idName.isEmpty()) {
            m_componentName = m_idName;
            m_componentName[0] = m_componentName.at(0).toUpper();
+            m_componentName.prepend("My");
        }

        setDescription(QCoreApplication::translate("QmlJSEditor::ComponentFromObjectDef",