diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-24 01:00:21 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-24 01:00:21 +0200 |
commit | 2ebbf03e880467ecc95adfafe7c0404add8a3328 (patch) | |
tree | 3cce73a83a3b6cb1dd3cefd936a915b333d1fd65 /src/quick/util | |
parent | 33bfa05c59a0d4ebcc8943ff710ee1da207da014 (diff) | |
parent | 8a2c182d5941a1d00ac9f7414d1508b7f959d6f3 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ic67fa1536977310b15ba55ee2220536aacef2b3c
Diffstat (limited to 'src/quick/util')
-rw-r--r-- | src/quick/util/qquickstategroup.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp index c852c16509..3d8c5e0507 100644 --- a/src/quick/util/qquickstategroup.cpp +++ b/src/quick/util/qquickstategroup.cpp @@ -302,10 +302,18 @@ void QQuickStateGroup::componentComplete() Q_D(QQuickStateGroup); d->componentComplete = true; + QSet<QString> names; for (int ii = 0; ii < d->states.count(); ++ii) { QQuickState *state = d->states.at(ii); if (!state->isNamed()) state->setName(QLatin1String("anonymousState") + QString::number(++d->unnamedCount)); + + const QString stateName = state->name(); + if (names.contains(stateName)) { + qmlWarning(state->parent()) << "Found duplicate state name: " << stateName; + } else { + names << stateName; + } } if (d->updateAutoState()) { |