aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Wicking <paulwicking@gmail.com>2020-06-05 14:36:01 +0200
committerPaul Wicking <paulwicking@gmail.com>2020-06-05 14:36:01 +0200
commitd112da7427513d497756add95e3ae6300f9ee66b (patch)
tree2855a81a82f24c66cd8f844258290791d5e51597
parentc6f91c7457c260c3fc453f6d60c6fcb5ca4d49d0 (diff)
parent9dc5996de04420710cda81f91c1b4ff34ee064f2 (diff)
Merge 5.12 into 5.12.9v5.12.95.12.9
-rw-r--r--src/quicktemplates2/qquickstackview.cpp37
-rw-r--r--src/quicktemplates2/qquickstackview_p.cpp6
-rw-r--r--src/quicktemplates2/qquickstackview_p_p.h3
-rw-r--r--tests/auto/controls/data/tst_stackview.qml38
4 files changed, 64 insertions, 20 deletions
diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp
index 16e5f08d..43988f5d 100644
--- a/src/quicktemplates2/qquickstackview.cpp
+++ b/src/quicktemplates2/qquickstackview.cpp
@@ -556,7 +556,14 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio
void QQuickStackView::push(QQmlV4Function *args)
{
Q_D(QQuickStackView);
- QScopedValueRollback<QString> rollback(d->operation, QStringLiteral("push"));
+ const QString operationName = QStringLiteral("push");
+ if (d->modifyingElements) {
+ d->warnOfInterruption(operationName);
+ return;
+ }
+
+ QScopedValueRollback<bool> modifyingElements(d->modifyingElements, true);
+ QScopedValueRollback<QString> operationNameRollback(d->operation, operationName);
if (args->length() <= 0) {
d->warn(QStringLiteral("missing arguments"));
args->setReturnValue(QV4::Encode::null());
@@ -649,14 +656,15 @@ void QQuickStackView::push(QQmlV4Function *args)
void QQuickStackView::pop(QQmlV4Function *args)
{
Q_D(QQuickStackView);
- if (d->removingElements) {
- d->warn(QStringLiteral("cannot pop while already in the process of removing elements"));
+ const QString operationName = QStringLiteral("pop");
+ if (d->modifyingElements) {
+ d->warnOfInterruption(operationName);
args->setReturnValue(QV4::Encode::null());
return;
}
- QScopedValueRollback<bool> removingElements(d->removingElements, true);
- QScopedValueRollback<QString> rollback(d->operation, QStringLiteral("pop"));
+ QScopedValueRollback<bool> modifyingElements(d->modifyingElements, true);
+ QScopedValueRollback<QString> operationNameRollback(d->operation, operationName);
int argc = args->length();
if (d->elements.count() <= 1 || argc > 2) {
if (argc > 2)
@@ -811,14 +819,15 @@ void QQuickStackView::pop(QQmlV4Function *args)
void QQuickStackView::replace(QQmlV4Function *args)
{
Q_D(QQuickStackView);
- if (d->removingElements) {
- d->warn(QStringLiteral("cannot replace while already in the process of removing elements"));
+ const QString operationName = QStringLiteral("replace");
+ if (d->modifyingElements) {
+ d->warnOfInterruption(operationName);
args->setReturnValue(QV4::Encode::null());
return;
}
- QScopedValueRollback<bool> removingElements(d->removingElements, true);
- QScopedValueRollback<QString> rollback(d->operation, QStringLiteral("replace"));
+ QScopedValueRollback<bool> modifyingElements(d->modifyingElements, true);
+ QScopedValueRollback<QString> operationNameRollback(d->operation, operationName);
if (args->length() <= 0) {
d->warn(QStringLiteral("missing arguments"));
args->setReturnValue(QV4::Encode::null());
@@ -914,12 +923,14 @@ void QQuickStackView::clear(Operation operation)
if (d->elements.isEmpty())
return;
- if (d->removingElements) {
- d->warn(QStringLiteral("cannot clear while already in the process of removing elements"));
+ const QString operationName = QStringLiteral("clear");
+ if (d->modifyingElements) {
+ d->warnOfInterruption(operationName);
return;
}
- QScopedValueRollback<bool> removingElements(d->removingElements, true);
+ QScopedValueRollback<bool> modifyingElements(d->modifyingElements, true);
+ QScopedValueRollback<QString> operationNameRollback(d->operation, operationName);
if (operation != Immediate) {
QQuickStackElement *exit = d->elements.pop();
exit->removal = true;
@@ -1126,7 +1137,7 @@ void QQuickStackView::componentComplete()
QQuickControl::componentComplete();
Q_D(QQuickStackView);
- QScopedValueRollback<QString> rollback(d->operation, QStringLiteral("initialItem"));
+ QScopedValueRollback<QString> operationNameRollback(d->operation, QStringLiteral("initialItem"));
QQuickStackElement *element = nullptr;
QString error;
int oldDepth = d->elements.count();
diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp
index 7cb943a3..f12e283f 100644
--- a/src/quicktemplates2/qquickstackview_p.cpp
+++ b/src/quicktemplates2/qquickstackview_p.cpp
@@ -56,6 +56,12 @@ void QQuickStackViewPrivate::warn(const QString &error)
qmlWarning(q) << operation << ": " << error;
}
+void QQuickStackViewPrivate::warnOfInterruption(const QString &attemptedOperation)
+{
+ Q_Q(QQuickStackView);
+ qmlWarning(q) << "cannot " << attemptedOperation << " while already in the process of completing a " << operation;
+}
+
void QQuickStackViewPrivate::setCurrentItem(QQuickStackElement *element)
{
Q_Q(QQuickStackView);
diff --git a/src/quicktemplates2/qquickstackview_p_p.h b/src/quicktemplates2/qquickstackview_p_p.h
index b687561c..91f74edc 100644
--- a/src/quicktemplates2/qquickstackview_p_p.h
+++ b/src/quicktemplates2/qquickstackview_p_p.h
@@ -72,6 +72,7 @@ public:
}
void warn(const QString &error);
+ void warnOfInterruption(const QString &attemptedOperation);
void setCurrentItem(QQuickStackElement *element);
@@ -93,7 +94,7 @@ public:
void depthChange(int newDepth, int oldDepth);
bool busy = false;
- bool removingElements = false;
+ bool modifyingElements = false;
QString operation;
QJSValue initialItem;
QQuickItem *currentItem = nullptr;
diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml
index c6515f77..d2211034 100644
--- a/tests/auto/controls/data/tst_stackview.qml
+++ b/tests/auto/controls/data/tst_stackview.qml
@@ -804,7 +804,10 @@ TestCase {
var item = control.push(component, StackView.Immediate)
verify(item)
- item.StackView.onRemoved.connect(function() { control.push(component, StackView.Immediate) } )
+ item.StackView.onRemoved.connect(function() {
+ ignoreWarning(/.*QML StackView: cannot push while already in the process of completing a pop/)
+ control.push(component, StackView.Immediate)
+ })
// don't crash (QTBUG-62153)
control.pop(StackView.Immediate)
@@ -1287,7 +1290,7 @@ TestCase {
control.push(container.clearUponDestructionComponent, StackView.Immediate)
// Shouldn't crash.
- ignoreWarning(new RegExp(".*cannot clear while already in the process of removing elements"))
+ ignoreWarning(/.*cannot clear while already in the process of completing a clear/)
control.clear(StackView.Immediate)
}
@@ -1301,7 +1304,7 @@ TestCase {
// Pop all items except the first, removing the second item we pushed in the process.
// Shouldn't crash.
- ignoreWarning(new RegExp(".*cannot clear while already in the process of removing elements"))
+ ignoreWarning(/.*cannot clear while already in the process of completing a pop/)
control.pop(null, StackView.Immediate)
}
@@ -1316,7 +1319,7 @@ TestCase {
control.push(container.clearUponDestructionComponent, StackView.Immediate)
// Pop the top item, then pop down to the first item in response.
- ignoreWarning(new RegExp(".*cannot pop while already in the process of removing elements"))
+ ignoreWarning(/.*cannot pop while already in the process of completing a pop/)
control.pop(StackView.Immediate)
}
@@ -1329,7 +1332,7 @@ TestCase {
control.push(container.clearUponDestructionComponent, StackView.Immediate)
// Replace the top item, then clear in response.
- ignoreWarning(new RegExp(".*cannot clear while already in the process of removing elements"))
+ ignoreWarning(/.*cannot clear while already in the process of completing a replace/)
control.replace(component, StackView.Immediate)
}
@@ -1342,7 +1345,30 @@ TestCase {
control.push(container.clearUponDestructionComponent, StackView.Immediate)
// Replace the top item, then clear in response.
- ignoreWarning(new RegExp(".*cannot replace while already in the process of removing elements"))
+ ignoreWarning(/.*cannot replace while already in the process of completing a clear/)
control.clear(StackView.Immediate)
}
+
+ // QTBUG-84381
+ function test_clearAndPushAfterDepthChange() {
+ var control = createTemporaryObject(stackView, testCase, {
+ popEnter: null, popExit: null, pushEnter: null,
+ pushExit: null, replaceEnter: null, replaceExit: null
+ })
+ verify(control)
+
+ control.depthChanged.connect(function() {
+ if (control.depth === 2) {
+ // Shouldn't assert.
+ ignoreWarning(/.*QML StackView: cannot clear while already in the process of completing a push/)
+ control.clear()
+ // Shouldn't crash.
+ ignoreWarning(/.*QML StackView: cannot push while already in the process of completing a push/)
+ control.push(component)
+ }
+ })
+
+ control.push(component)
+ control.push(component)
+ }
}