diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-04 11:03:03 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-04 11:03:03 (GMT) |
| commit | 447c5812f996b632734fc74ca491422e7cbbed43 (patch) | |
| tree | dab0597d1d74e0e6e377f3bffdf2315b52058539 /src/gui/dialogs/qdialog.cpp | |
| parent | 445ef8847979dab72893aab1924d46d0fe1a8a3e (diff) | |
| parent | ab672d88f906b0d6f2d45f9ebbfbf12fdcfba51e (diff) | |
| download | Qt-447c5812f996b632734fc74ca491422e7cbbed43.zip Qt-447c5812f996b632734fc74ca491422e7cbbed43.tar.gz Qt-447c5812f996b632734fc74ca491422e7cbbed43.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/gui/dialogs/qdialog.cpp')
| -rw-r--r-- | src/gui/dialogs/qdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index 9e0437c..b7a0026 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -1111,7 +1111,7 @@ QSize QDialog::sizeHint() const // if size is not fixed, try to adjust it according to S60 layoutting if (minimumSize() != maximumSize()) { // In S60, dialogs are always the width of screen (in portrait, regardless of current layout) - return QSize(qMax(S60->screenHeightInPixels, S60->screenWidthInPixels), QWidget::sizeHint().height()); + return QSize(qMin(S60->screenHeightInPixels, S60->screenWidthInPixels), QWidget::sizeHint().height()); } else { return QWidget::sizeHint(); } |