diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-10-30 00:49:43 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-10-30 00:49:43 +0100 |
| commit | 708e4f7e626468f53636b7d2ef7c6a99c129751f (patch) | |
| tree | 18e983f3aa8cc15c73a24ededc1eabdbb4c6d800 /src/quick | |
| parent | 4207940684b578469f7ec6b428403af85e579b2c (diff) | |
| parent | 475c74a9926efcd968572563e678988e53804603 (diff) | |
Merge 5.12 into 5.12.0
Change-Id: I9c455be35c18031c1eb4e8ca8d4b85183f72a051
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickflickable_p.h | 9 | ||||
| -rw-r--r-- | src/quick/items/qquicktext_p.h | 6 | ||||
| -rw-r--r-- | src/quick/util/qquickstategroup.cpp | 9 |
3 files changed, 18 insertions, 6 deletions
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index 1bd8fc1020..b7c4fa5b67 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -267,10 +267,11 @@ Q_SIGNALS: Q_REVISION(9) void horizontalOvershootChanged(); Q_REVISION(9) void verticalOvershootChanged(); - Q_REVISION(12) void atXEndChanged(); - Q_REVISION(12) void atYEndChanged(); - Q_REVISION(12) void atXBeginningChanged(); - Q_REVISION(12) void atYBeginningChanged(); + // The next four signals should be marked as Q_REVISION(12). See QTBUG-71243 + void atXEndChanged(); + void atYEndChanged(); + void atXBeginningChanged(); + void atYBeginningChanged(); protected: bool childMouseEventFilter(QQuickItem *, QEvent *) override; diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index f4e7fa7046..1af60051fb 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -272,8 +272,10 @@ Q_SIGNALS: void textFormatChanged(QQuickText::TextFormat textFormat); void elideModeChanged(QQuickText::TextElideMode mode); void contentSizeChanged(); - Q_REVISION(12) void contentWidthChanged(qreal contentWidth); - Q_REVISION(12) void contentHeightChanged(qreal contentHeight); + // The next two signals should be marked as Q_REVISION(12). See QTBUG-71247 + void contentWidthChanged(qreal contentWidth); + void contentHeightChanged(qreal contentHeight); + void lineHeightChanged(qreal lineHeight); void lineHeightModeChanged(LineHeightMode mode); void fontSizeModeChanged(); diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp index c852c16509..d8daec2f07 100644 --- a/src/quick/util/qquickstategroup.cpp +++ b/src/quick/util/qquickstategroup.cpp @@ -302,10 +302,19 @@ void QQuickStateGroup::componentComplete() Q_D(QQuickStateGroup); d->componentComplete = true; + QVarLengthArray<QString, 4> names; + names.reserve(d->states.count()); 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.append(std::move(stateName)); + } } if (d->updateAutoState()) { |