diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-04 15:04:14 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-15 10:36:05 (GMT) |
| commit | 815911cc85883f621874d3c11714e80dc352ee29 (patch) | |
| tree | 1c9b662cebffef5255a629d1a239062a3d90f7db /src | |
| parent | 77715148d635c31d7042140c93013a1af77f2967 (diff) | |
| download | Qt-815911cc85883f621874d3c11714e80dc352ee29.zip Qt-815911cc85883f621874d3c11714e80dc352ee29.tar.gz Qt-815911cc85883f621874d3c11714e80dc352ee29.tar.bz2 | |
Fixes a behaviour for QDockWidget used without QMainWindow
There was a behaviour change. Even though using QDockWidget without
QMainWindow is not supported, it broke applications.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qdockwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qdockwidget.cpp b/src/gui/widgets/qdockwidget.cpp index fdace46..54189de 100644 --- a/src/gui/widgets/qdockwidget.cpp +++ b/src/gui/widgets/qdockwidget.cpp @@ -1010,7 +1010,7 @@ void QDockWidgetPrivate::setWindowState(bool floating, bool unplug, const QRect if (!floating && parent) { QMainWindowLayout *mwlayout = qobject_cast<QMainWindowLayout *>(q->parentWidget()->layout()); - if (!mwlayout || mwlayout->dockWidgetArea(q) == Qt::NoDockWidgetArea) + if (mwlayout && mwlayout->dockWidgetArea(q) == Qt::NoDockWidgetArea) return; // this dockwidget can't be redocked } |