diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-07-06 09:49:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-07-06 09:49:11 +0200 |
| commit | 609510c3235555dedc59039a040fad094d5368e1 (patch) | |
| tree | 9450275750b9eb18f3585f988d5770c4579ef48a /src/plugins/studiowelcome | |
| parent | 29aba317416e5d6999b8e0ce8f685e8859c54747 (diff) | |
| parent | ca3f7a7bb2e591cf39f25ad1f856557d018b9cd2 (diff) | |
Merge remote-tracking branch 'origin/11.0'
Conflicts:
doc/qtdesignstudio/src/views/qtquick-designer.qdoc
Change-Id: I5d7ea23e356add0cbb2ad01ceb5e433377dc51c2
Diffstat (limited to 'src/plugins/studiowelcome')
| -rw-r--r-- | src/plugins/studiowelcome/stylemodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/studiowelcome/stylemodel.cpp b/src/plugins/studiowelcome/stylemodel.cpp index 520129f20d4..8b36151a9e2 100644 --- a/src/plugins/studiowelcome/stylemodel.cpp +++ b/src/plugins/studiowelcome/stylemodel.cpp @@ -63,7 +63,7 @@ int StyleModel::filteredIndex(int actualIndex) if (actualIndex < 0) return actualIndex; - QTC_ASSERT(actualIndex < m_items.size(), return -1); + QTC_ASSERT(actualIndex < Utils::ssize(m_items), return -1); QStandardItem *item = m_items.at(actualIndex); // TODO: perhaps should add this kind of find to utils/algorithm.h |