summaryrefslogtreecommitdiffstats
path: root/doc/layout.doc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-05 22:04:08 -0600
committerTimothy Pearson <[email protected]>2011-12-05 22:04:08 -0600
commite02e31c8b9d854cd62cbe9799228f6e08e882773 (patch)
tree53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /doc/layout.doc
parent143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff)
downloadtqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz
tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip
Sync with latest script
Diffstat (limited to 'doc/layout.doc')
-rw-r--r--doc/layout.doc14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/layout.doc b/doc/layout.doc
index bb51aebf3..4c5a8461b 100644
--- a/doc/layout.doc
+++ b/doc/layout.doc
@@ -16,7 +16,7 @@
** and the KDE Free Qt Foundation.
**
** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
** http://trolltech.com/products/qt/licenses/licensing/opensource/.
** If you are unsure which license is appropriate for your use, please
** review the following information:
@@ -123,11 +123,11 @@ only get more space if no other widgets want the space. Of these,
space is allocated to widgets with an \c Expanding size policy first.
\i Any widgets that are allocated less space than their minimum size
(or minimum size hint if no minimum size is specified) are allocated
-this minimum size they retquire. (Widgets don't have to have a minimum
+this minimum size they require. (Widgets don't have to have a minimum
size or minimum size hint in which case the strech factor is their
determining factor.)
\i Any widgets that are allocated more space than their maximum size
-are allocated the maximum size space they retquire. (Widgets don't have
+are allocated the maximum size space they require. (Widgets don't have
to have a maximum size in which case the strech factor is their
determining factor.)
\endlist
@@ -237,7 +237,7 @@ layout, you should reimplement the following QWidget member functions:
\i QWidget::sizeHint() returns the preferred size of the widget.
\i QWidget::minimumSizeHint() returns the smallest size the widget can have.
\i QWidget::sizePolicy() returns a \l QSizePolicy; a value describing
- the space retquirements of the widget.
+ the space requirements of the widget.
\endlist
Call QWidget::updateGeometry() whenever the size hint, minimum size
@@ -257,13 +257,13 @@ support heightForWidth() (both QGridLayout and QBoxLayout support it).
For further guidance when implementing these functions, see their
implementations in existing Qt classes that have similar layout
-retquirements to your new widget.
+requirements to your new widget.
\section1 Manual Layout
If you are making a one-of-a-kind special layout, you can also make a
custom widget as described above. Reimplement QWidget::resizeEvent()
-to calculate the retquired distribution of sizes and call \link
+to calculate the required distribution of sizes and call \link
QWidget::setGeometry() setGeometry\endlink() on each child.
The widget will get an event with \link QEvent::type() type \endlink
@@ -405,7 +405,7 @@ addItem() implements the default placement strategy for layout items.
It must be implemented. It is used by QLayout::add(), by the QLayout
constructor that takes a layout as parent, and it is used to implement
the \link QLayout::autoAdd() auto-add\endlink feature. If your layout
-has advanced placement options that retquire parameters, you must
+has advanced placement options that require parameters, you must
provide extra access functions such as \l QGridLayout::addMultiCell().
\code