summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-07-26 21:49:41 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-07-26 21:49:42 +0200
commitd013eb055c31cec9bc29126939be109e0ac1aad5 (patch)
tree352ae70aa5ecebd665bd6b36d68348f31cd5781e /src/corelib/global
parent9fabb548daed933a54d24871eade9f60f9c2ae55 (diff)
parent78f9f4b4970e6f4155b7cf2e88c6ac540dec47bc (diff)
Merge remote-tracking branch 'origin/release' into stable
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qnamespace.qdoc8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index f9248eb68d..677cddc87e 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -1207,12 +1207,8 @@
/*! \typedef Qt::HANDLE
- Platform-specific handle type for system objects. This is
- equivalent to \c{void *} on Mac OS X and embedded Linux,
- and to \c{unsigned long} on X11. On Windows it is the
- DWORD returned by the Win32 function getCurrentThreadId().
-
- \warning Using this type is not portable.
+ A handle type for system objects, defined as \c{void *}
+ on all platforms.
*/
/*!