summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qscrollarea.cpp
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-03-24 05:05:43 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-03-24 05:06:59 (GMT)
commit24bfb5cfc80966b15a58be6ef8dc5514d3318af1 (patch)
tree153879a8a41148a45c0f66ee74acd4b972bbca50 /src/gui/widgets/qscrollarea.cpp
parent774a3536b00c4d6e4c4c10b708e31b4373a338e3 (diff)
parentf5812ae1b669daa921eeabc903ec0eafcfe0c030 (diff)
downloadQt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.zip
Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.tar.gz
Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.tar.bz2
Merge qt/qt.git master into qa-team-master
Diffstat (limited to 'src/gui/widgets/qscrollarea.cpp')
-rw-r--r--src/gui/widgets/qscrollarea.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qscrollarea.cpp b/src/gui/widgets/qscrollarea.cpp
index 932f74a..d33c3ac 100644
--- a/src/gui/widgets/qscrollarea.cpp
+++ b/src/gui/widgets/qscrollarea.cpp
@@ -121,7 +121,7 @@ QT_BEGIN_NAMESPACE
If a scroll area is used to display the contents of a widget that
contains child widgets arranged in a layout, it is important to
- realise that the size policy of the layout will also determine the
+ realize that the size policy of the layout will also determine the
size of the widget. This is especially useful to know if you intend
to dynamically change the contents of the layout. In such cases,
setting the layout's \l{QLayout::sizeConstraint}{size constraint}