diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-05-05 09:36:15 (GMT) |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-05-05 09:36:15 (GMT) |
| commit | c03a4544fa3c1400fef3f1ad847bc3c65e660de7 (patch) | |
| tree | 9d9cd6837d9fa3dcbbbf6574d0d2c11be4390c6b /doc/src | |
| parent | 4287f0e94a643c9c7cf8bced6722163026e1a6bf (diff) | |
| parent | f8f5fe02590da7e67829caf118ba73d455192ec8 (diff) | |
| download | Qt-c03a4544fa3c1400fef3f1ad847bc3c65e660de7.zip Qt-c03a4544fa3c1400fef3f1ad847bc3c65e660de7.tar.gz Qt-c03a4544fa3c1400fef3f1ad847bc3c65e660de7.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/designer-manual.qdoc | 12 | ||||
| -rw-r--r-- | doc/src/porting4.qdoc | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc index e10a5be..03b74e6 100644 --- a/doc/src/designer-manual.qdoc +++ b/doc/src/designer-manual.qdoc @@ -344,10 +344,14 @@ of a QLineEdit or the width and height of item view widgets. This is where the widget size constraints -- \l{QWidget::minimumSize()}{minimumSize} and \l{QWidget::maximumSize()}{maximumSize} constraints come into play. These - are properties you can set in the property editor. Alternatively, to use - the current size as a size constraint value, choose one of the - \gui{Size Constraint} options from the widget's context menu. The layout - will then ensure that those constraints are met. + are properties you can set in the property editor. For example, to override + the default \l{QWidget::}{sizeHint()}, simply set + \l{QWidget::minimumSize()}{minimumSize} and \l{QWidget::maximumSize()} + {maximumSize} to the same value. Alternatively, to use the current size as + a size constraint value, choose one of the \gui{Size Constraint} options + from the widget's context menu. The layout will then ensure that those + constraints are met. To control the size of your widgets via code, you can + reimplement \l{QWidget::}{sizeHint()} in your code. The screenshot below shows the breakdown of a basic user interface designed using a grid. The coordinates on the screenshot show the position of each diff --git a/doc/src/porting4.qdoc b/doc/src/porting4.qdoc index c8a9e2b..b93e139 100644 --- a/doc/src/porting4.qdoc +++ b/doc/src/porting4.qdoc @@ -457,6 +457,7 @@ \row \o QToolButton::offIconSet \o Use the \l{QIcon::Off}{off component} of QAbstractButton::icon instead. \row \o QToolButton::onIconSet \o Use the \l{QIcon::On}{on component} of QAbstractButton::icon instead. \row \o QWidget::microFocusHint \o N/A + \row \o QMimeSource::serialNumber () \o N/A \endtable \omit |