diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-09-13 11:15:16 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-09-13 11:15:16 +0200 |
| commit | 5ae23f8c6644bc990c6c5132b15d27c0b1287ea7 (patch) | |
| tree | e303987b0f871158826c3ac08adbdb3b16f054a1 /src/plugins/qtsupport/exampleslistmodel.cpp | |
| parent | fbd4775f899cda7a802cbdbec8e596ed8a0358de (diff) | |
| parent | 67408ac1830a3d2493273cd74fe2941b38ba4b87 (diff) | |
Merge remote-tracking branch 'origin/8.0'
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
Diffstat (limited to 'src/plugins/qtsupport/exampleslistmodel.cpp')
| -rw-r--r-- | src/plugins/qtsupport/exampleslistmodel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp index a0416e17ce..1eba8d2598 100644 --- a/src/plugins/qtsupport/exampleslistmodel.cpp +++ b/src/plugins/qtsupport/exampleslistmodel.cpp @@ -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); } |