diff options
| author | Bernhard Rosenkraenzer <br@blankpage.ch> | 2010-03-23 19:13:19 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-03-23 19:13:31 (GMT) |
| commit | 6da690f031420957dec795c2899f337c296eff0b (patch) | |
| tree | 1d8f9f42227fb515873e4e2bf50c408855d8b7ce | |
| parent | 0be215ea57fa7bd0787d995381b24faaf23d1b7b (diff) | |
| download | Qt-6da690f031420957dec795c2899f337c296eff0b.zip Qt-6da690f031420957dec795c2899f337c296eff0b.tar.gz Qt-6da690f031420957dec795c2899f337c296eff0b.tar.bz2 | |
Fix build with QT_NO_DOCKWIDGET
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| -rw-r--r-- | src/gui/widgets/qmainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qtoolbarlayout.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index d2eda80..44483ea 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -1374,7 +1374,9 @@ bool QMainWindow::event(QEvent *event) #endif // QT_NO_STATUSTIP case QEvent::StyleChange: +#ifndef QT_NO_DOCKWIDGET d->layout->layoutState.dockAreaLayout.styleChangedEvent(); +#endif if (!d->explicitIconSize) setIconSize(QSize()); break; diff --git a/src/gui/widgets/qtoolbarlayout.cpp b/src/gui/widgets/qtoolbarlayout.cpp index 4eb252a..f87510f 100644 --- a/src/gui/widgets/qtoolbarlayout.cpp +++ b/src/gui/widgets/qtoolbarlayout.cpp @@ -654,7 +654,11 @@ void QToolBarLayout::setExpanded(bool exp) 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(); |