diff options
author | jasplin <qt-info@nokia.com> | 2009-05-18 12:20:48 (GMT) |
---|---|---|
committer | jasplin <qt-info@nokia.com> | 2009-05-18 12:27:24 (GMT) |
commit | e7653f2d2cef626b1dc9ad07753b99c38b015eac (patch) | |
tree | bbb20cb4101c1c08e9f55c2a43b46531685552c7 | |
parent | f4a900fe10e9700a8b8615bcb55006dd26c5f4bb (diff) | |
download | Qt-e7653f2d2cef626b1dc9ad07753b99c38b015eac.zip Qt-e7653f2d2cef626b1dc9ad07753b99c38b015eac.tar.gz Qt-e7653f2d2cef626b1dc9ad07753b99c38b015eac.tar.bz2 |
Fixed regression introduced by fix for Task 177022.
The fix for Task 177022 broke the fix for Task 163334.
This commit fixes the regression.
Reviewed-by: janarve
-rw-r--r-- | src/gui/dialogs/qwizard.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp index 6f2ab0a..2c29ebf 100644 --- a/src/gui/dialogs/qwizard.cpp +++ b/src/gui/dialogs/qwizard.cpp @@ -1241,8 +1241,10 @@ void QWizardPrivate::updateMinMaxSizes(const QWizardLayoutInfo &info) #endif QSize minimumSize = mainLayout->totalMinimumSize() + QSize(0, extraHeight); QSize maximumSize; + bool skipMaxSize = false; #if defined(Q_WS_WIN) - if (QSysInfo::WindowsVersion > QSysInfo::WV_Me) // ### See Tasks 164078 and 161660 + if (QSysInfo::WindowsVersion <= QSysInfo::WV_Me) // ### See Tasks 164078 and 161660 + skipMaxSize = true; #endif maximumSize = mainLayout->totalMaximumSize(); if (info.header && headerWidget->maximumWidth() != QWIDGETSIZE_MAX) { @@ -1263,11 +1265,13 @@ void QWizardPrivate::updateMinMaxSizes(const QWizardLayoutInfo &info) } if (q->maximumWidth() == maximumWidth) { maximumWidth = maximumSize.width(); - q->setMaximumWidth(maximumWidth); + if (!skipMaxSize) + q->setMaximumWidth(maximumWidth); } if (q->maximumHeight() == maximumHeight) { maximumHeight = maximumSize.height(); - q->setMaximumHeight(maximumHeight); + if (!skipMaxSize) + q->setMaximumHeight(maximumHeight); } } |