changeset 30 | 5dc02b23752f |
parent 18 | 2f34d5167611 |
--- a/src/gui/widgets/qtoolbarlayout.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/gui/widgets/qtoolbarlayout.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -654,7 +654,11 @@ if (!tb) return; if (QMainWindow *win = qobject_cast<QMainWindow*>(tb->parentWidget())) { +#ifdef QT_NO_DOCKWIDGET + animating = false; +#else animating = !tb->isWindow() && win->isAnimated(); +#endif QMainWindowLayout *layout = qobject_cast<QMainWindowLayout*>(win->layout()); if (expanded) { tb->raise();