diff options
author | David Boddie <david.boddie@nokia.com> | 2011-05-05 12:17:35 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2011-05-05 12:17:35 (GMT) |
commit | 75b3dd0fa5525c8a998c3db2eb72aa10882ae123 (patch) | |
tree | ede2e2fa55b59c95fe7c5732ad9f7f9b30eb24f0 /src/gui/widgets/qworkspace.cpp | |
parent | 2a58e8a661fa192e3cf29da018b9fd58b559ab64 (diff) | |
parent | 1a501753921c450cd7579cf955c16cd306e22c9d (diff) | |
download | Qt-75b3dd0fa5525c8a998c3db2eb72aa10882ae123.zip Qt-75b3dd0fa5525c8a998c3db2eb72aa10882ae123.tar.gz Qt-75b3dd0fa5525c8a998c3db2eb72aa10882ae123.tar.bz2 |
Merge commit 'refs/merge-requests/1220' of git://gitorious.org/qt/qt into merge-requests/1220
Diffstat (limited to 'src/gui/widgets/qworkspace.cpp')
-rw-r--r-- | src/gui/widgets/qworkspace.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/widgets/qworkspace.cpp b/src/gui/widgets/qworkspace.cpp index bf50d07..13ef13b 100644 --- a/src/gui/widgets/qworkspace.cpp +++ b/src/gui/widgets/qworkspace.cpp @@ -1239,7 +1239,6 @@ QWidget * QWorkspace::addWindow(QWidget *w, Qt::WindowFlags flags) int x = w->x(); int y = w->y(); bool hasPos = w->testAttribute(Qt::WA_Moved); - QSize s = w->size().expandedTo(qSmartMinSize(w)); if (!hasSize && w->sizeHint().isValid()) w->adjustSize(); |