diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 22:45:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 22:45:21 (GMT) |
| commit | f560032067ee6b2e4c1badf34cc92e01ec5e9afa (patch) | |
| tree | 0a480542a52032c7bd0330248e0a4512be70241d /src | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| parent | de73874e1f52ed323b87a36d072048023d22112e (diff) | |
| download | Qt-f560032067ee6b2e4c1badf34cc92e01ec5e9afa.zip Qt-f560032067ee6b2e4c1badf34cc92e01ec5e9afa.tar.gz Qt-f560032067ee6b2e4c1badf34cc92e01ec5e9afa.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed the position of the dock widget when undocked
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qdockwidget.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/widgets/qdockwidget.cpp b/src/gui/widgets/qdockwidget.cpp index 54189de..ae00710 100644 --- a/src/gui/widgets/qdockwidget.cpp +++ b/src/gui/widgets/qdockwidget.cpp @@ -1270,11 +1270,7 @@ void QDockWidget::setFloating(bool floating) d->setWindowState(floating, false, floating ? r : QRect()); if (floating && r.isNull()) { - QDockWidgetLayout *layout = qobject_cast<QDockWidgetLayout*>(this->layout()); - QRect titleArea = layout->titleArea(); - int h = layout->verticalTitleBar ? titleArea.width() : titleArea.height(); - QPoint p = mapToGlobal(QPoint(h, h)); - move(p); + setAttribute(Qt::WA_Moved, false); //we want it at the default position } } |