summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-11-13 09:51:04 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-11-13 09:51:11 (GMT)
commit63856f13721bce420fe94dab31c36329af976276 (patch)
tree5a2c1d5d49a76a7794fcfd46a6fa664f657ae0fe /src/corelib/global
parentf5c5cc585cef8d2d2f77e7d83d7a07c6d70f0d09 (diff)
parent6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9 (diff)
downloadQt-63856f13721bce420fe94dab31c36329af976276.zip
Qt-63856f13721bce420fe94dab31c36329af976276.tar.gz
Qt-63856f13721bce420fe94dab31c36329af976276.tar.bz2
Merge commit upstream/4.6 into oslo-staging-2/4.6
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qnamespace.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 5ac3675..ae47f13 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -2003,7 +2003,7 @@
\value Tool Indicates that the widget is a tool window. A tool
window is often a small window with a smaller than
usual title bar and decoration, typically used for
- collections of tool buttons. It there is a parent,
+ collections of tool buttons. If there is a parent,
the tool window will always be kept on top of it.
If there isn't a parent, you may consider using
Qt::WindowStaysOnTopHint as well. If the window