summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qobject.cpp
diff options
context:
space:
mode:
authorMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-08 07:06:17 (GMT)
committerMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-08 07:06:17 (GMT)
commit75fc8ab96ee142ade5362eeaa94ce7e47ebcb579 (patch)
tree36a8c57866582eeff875615c0aeb1a0f148ba1c3 /src/corelib/kernel/qobject.cpp
parent93ea4a9cd6336de6e2a63b1ca075a7fdb835cfa7 (diff)
parent23ae8b6badfd688f962590268a6147771d27266c (diff)
downloadQt-75fc8ab96ee142ade5362eeaa94ce7e47ebcb579.zip
Qt-75fc8ab96ee142ade5362eeaa94ce7e47ebcb579.tar.gz
Qt-75fc8ab96ee142ade5362eeaa94ce7e47ebcb579.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
-rw-r--r--src/corelib/kernel/qobject.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 310bd41..860180e 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -912,7 +912,8 @@ QObject::~QObject()
\relates QObject
Returns the given \a object cast to type T if the object is of type
- T (or of a subclass); otherwise returns 0.
+ T (or of a subclass); otherwise returns 0. If \a object is 0 then
+ it will also return 0.
The class T must inherit (directly or indirectly) QObject and be
declared with the \l Q_OBJECT macro.