diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-04 12:47:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-04 12:47:04 +0200 |
| commit | 1ace238ce0347857a5ba55d6fa30ba81fed204b9 (patch) | |
| tree | c841b0ff52a306b6b0421d084b3fdbb206badf6b /src/designer/src/lib/shared/qdesigner_command.cpp | |
| parent | 066affc7c709c8a124a4c031ca2bb5ad3f91e6ff (diff) | |
| parent | 5c50201d616eeefe61b960a8b21d3adbae8c26a0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-alpha1
Change-Id: I82a3e068458fe176ec0e4c441e53a4fa97ae5d4b
Diffstat (limited to 'src/designer/src/lib/shared/qdesigner_command.cpp')
| -rw-r--r-- | src/designer/src/lib/shared/qdesigner_command.cpp | 1 |
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 c83bc91ac..90dd00bf2 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(); |