summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-07-20 09:32:12 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-08-28 08:43:37 +0000
commit9a6dd30d0a71dfece28f4f0360f4e266ec386607 (patch)
tree3801d750ae3853a1974a3b06514aa769eb9cc533
parent28b1b88a0b85f4ce7765ed5cc5f3780f97e5ea4f (diff)
downloadqttools-9a6dd30d0a71dfece28f4f0360f4e266ec386607.tar.gz
Designer: Remove widget from Z-order list in ReparentWidgetCommand::undo()
The statement was apparently forgotten. Task-number: QTBUG-62049 Change-Id: I9ab30ff2a094901965a76e8236a833f96cd7ec23 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
-rw-r--r--src/designer/src/lib/shared/qdesigner_command.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/designer/src/lib/shared/qdesigner_command.cpp b/src/designer/src/lib/shared/qdesigner_command.cpp
index 24e8d072e..d0b270cfa 100644
--- a/src/designer/src/lib/shared/qdesigner_command.cpp
+++ b/src/designer/src/lib/shared/qdesigner_command.cpp
@@ -610,6 +610,7 @@ void ReparentWidgetCommand::undo()
m_oldParentWidget->setProperty("_q_zOrder", QVariant::fromValue(m_oldParentZOrder));
QWidgetList newZOrder = qvariant_cast<QWidgetList>(m_newParentWidget->property("_q_zOrder"));
+ newZOrder.removeAll(m_widget);
m_newParentWidget->setProperty("_q_zOrder", QVariant::fromValue(newZOrder));
m_widget->show();