feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	.github/workflows/build_cmake.yml
	src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
	src/plugins/qmldesigner/designercore/model/model.cpp

Change-Id: I111b9140375b894a5487cc012b17cc32100bdb8d
This commit is contained in:
Eike Ziller
2022-09-13 11:15:16 +02:00
parent fbd4775f89 67408ac183
commit 5ae23f8c66
73 changed files with 2547 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qtsupport/exampleslistmodel.cpp
View File

@@ -666,6 +666,8 @@ void ExampleSetModel::selectExampleSet(int index)
if (getType(m_selectedExampleSetIndex) == ExampleSetModel::QtExampleSet) {
QtVersion *selectedQtVersion = QtVersionManager::version(getQtId(m_selectedExampleSetIndex));
m_selectedQtTypes = selectedQtVersion->targetDeviceTypes();
} else {
m_selectedQtTypes.clear();
}
emit selectedExampleSetChanged(m_selectedExampleSetIndex);
}