diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-03 06:22:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-03 06:22:16 (GMT) |
| commit | 46c4baa0915a9b9599b249833d1b2dd94eab3ca0 (patch) | |
| tree | 535452ad1360f132697410d489495861222b653d | |
| parent | fc539d4fe02b08edd3ffc50f0f8031cf97292146 (diff) | |
| parent | 2a67cbb031608e73b0e02a12ea26de6d43c9250d (diff) | |
| download | Qt-46c4baa0915a9b9599b249833d1b2dd94eab3ca0.zip Qt-46c4baa0915a9b9599b249833d1b2dd94eab3ca0.tar.gz Qt-46c4baa0915a9b9599b249833d1b2dd94eab3ca0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Give qmlviewer a minimum size if root object has no size.
| -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)); |