equal
deleted
inserted
replaced
652 |
652 |
653 QToolBar *tb = qobject_cast<QToolBar*>(parentWidget()); |
653 QToolBar *tb = qobject_cast<QToolBar*>(parentWidget()); |
654 if (!tb) |
654 if (!tb) |
655 return; |
655 return; |
656 if (QMainWindow *win = qobject_cast<QMainWindow*>(tb->parentWidget())) { |
656 if (QMainWindow *win = qobject_cast<QMainWindow*>(tb->parentWidget())) { |
|
657 #ifdef QT_NO_DOCKWIDGET |
|
658 animating = false; |
|
659 #else |
657 animating = !tb->isWindow() && win->isAnimated(); |
660 animating = !tb->isWindow() && win->isAnimated(); |
|
661 #endif |
658 QMainWindowLayout *layout = qobject_cast<QMainWindowLayout*>(win->layout()); |
662 QMainWindowLayout *layout = qobject_cast<QMainWindowLayout*>(win->layout()); |
659 if (expanded) { |
663 if (expanded) { |
660 tb->raise(); |
664 tb->raise(); |
661 } else { |
665 } else { |
662 QList<int> path = layout->layoutState.indexOf(tb); |
666 QList<int> path = layout->layoutState.indexOf(tb); |