diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-06 18:00:42 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-06 18:00:42 (GMT) |
| commit | 34bfad76d1afe4a0ee27496e740c8566387dc16c (patch) | |
| tree | c4304699a1a2d4a729bddfb3102a5ba3ad9a2cd8 /tools/qml/qmlruntime.cpp | |
| parent | 16c3df54960b776f35f59288b888e829e7e81002 (diff) | |
| parent | 608b66b5af75ae6982be428439eea735c00cc455 (diff) | |
| download | Qt-34bfad76d1afe4a0ee27496e740c8566387dc16c.zip Qt-34bfad76d1afe4a0ee27496e740c8566387dc16c.tar.gz Qt-34bfad76d1afe4a0ee27496e740c8566387dc16c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tools/qml/qmlruntime.cpp')
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index 7ea77d1..a368bc1 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -1520,7 +1520,7 @@ void QDeclarativeViewer::updateSizeHints(bool initial) //qWarning() << "USH: R2V: setting free size "; layout()->setSizeConstraint(QLayout::SetNoConstraint); layout()->activate(); - setMinimumSize(QSize(1,1)); + setMinimumSize(minimumSizeHint()); setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)); canvas->setMinimumSize(QSize(0,0)); canvas->setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)); |