Merge remote-tracking branch 'origin/9.0'

Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertychangesmodel.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertymodel.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.h

Change-Id: Ib029a830ee99190bc4ea2ad75d9300bfa86b42d9
This commit is contained in:
Tim Jenssen
2022-10-25 19:01:00 +02:00
186 changed files with 2027 additions and 1207 deletions

View File

@@ -2244,9 +2244,9 @@ void CdbEngine::checkQtSdkPdbFiles(const QString &module)
const QString message
= Tr::tr("The installed %1 is missing debug information files.\n"
"Locals and Expression might not be able to display all Qt Types in a "
"Locals and Expression might not be able to display all Qt types in a "
"human readable format.\n\n"
"Please install the \"Qt Debug Information Files\" Package from the "
"Install the \"Qt Debug Information Files\" Package from the "
"Maintenance Tool for this Qt installation to get all relevant "
"symbols for the debugger.")
.arg(qtName);