branch | GCC_SURGE |
changeset 31 | 5daf16870df6 |
parent 30 | 5dc02b23752f |
--- a/src/gui/widgets/qtoolbarlayout.cpp Mon Jun 21 22:38:13 2010 +0100 +++ b/src/gui/widgets/qtoolbarlayout.cpp Thu Jul 22 16:41:55 2010 +0100 @@ -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();