From 5d6916b4c1f6ea3b86cc3d820c433fec8a42fad0 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Thu, 14 Feb 2013 14:44:48 +0100 Subject: Doc: Removed reference to deprecated \badcode command. -QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: Ifabd51b7e433a1c30cf30c267d3ce63dded1bd43 Reviewed-by: Leena Miettinen --- src/corelib/doc/src/threads-basics.qdoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/corelib') diff --git a/src/corelib/doc/src/threads-basics.qdoc b/src/corelib/doc/src/threads-basics.qdoc index dad41368c6..dd5267f0ba 100644 --- a/src/corelib/doc/src/threads-basics.qdoc +++ b/src/corelib/doc/src/threads-basics.qdoc @@ -269,7 +269,8 @@ This is the result of running the code: - \badcode + \code + //bad code hello from GUI thread 3079423696 hello from worker thread 3076111216 \endcode -- cgit v1.2.3 From 2f5b4d47f6da4702dc6bfd411289aedf612bed6a Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Tue, 19 Feb 2013 23:52:48 +0000 Subject: Document the qintptr for public usage The QAbstractSocket API has been already using this as a return type. Hence, this has already been exposed to the public API users, anyhow. http://qt-project.org/doc/qt-5.0/qtnetwork/qabstractsocket.html#socketDescriptor A minor mistake has also been fixed in this commit at the quintptr section. Change-Id: I8143b3050428548ff6baee2e3a0bce4058ea8701 Reviewed-by: Thiago Macieira --- src/corelib/global/qglobal.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index a0c12b7b06..7fd9283579 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -642,12 +642,30 @@ Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n); \sa Q_UINT64_C(), qint64, qulonglong */ +/*! + \typedef qintptr + \relates + + Integral type for representing pointers in a signed integer (useful for + hashing, etc.). + + Typedef for either qint32 or qint64. This type is guaranteed to + be the same size as a pointer on all platforms supported by Qt. On + a system with 32-bit pointers, qintptr is a typedef for qint32; + on a system with 64-bit pointers, qintptr is a typedef for + qint64. + + Note that qintptr is signed. Use quintptr for unsigned values. + + \sa qptrdiff, qint32, qint64 +*/ + /*! \typedef quintptr \relates - Integral type for representing a pointers (useful for hashing, - etc.). + Integral type for representing pointers in an unsigned integer (useful for + hashing, etc.). Typedef for either quint32 or quint64. This type is guaranteed to be the same size as a pointer on all platforms supported by Qt. On -- cgit v1.2.3