diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 11:50:04 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 22:08:29 +0100 |
commit | dcb710dd87ab15c3af803133ff2449902dbec036 (patch) | |
tree | 1f3ed87165f05e45260ff45fb15d5df96d684abb /src/corelib | |
parent | 4606ea53958df33fffba680dd75c8b1733ca9f40 (diff) | |
parent | e47c2744e6cefa42fc70320e07d534742934f737 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/features/unix/separate_debug_info.prf
src/gui/kernel/qwindow_p.h
src/plugins/platforms/cocoa/qcocoacursor.mm
tests/auto/tools/moc/tst_moc.cpp
Change-Id: Ieb57834c00f961a747ffe51e6eb9fc9612cebccf
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/doc/src/threads-basics.qdoc | 3 | ||||
-rw-r--r-- | src/corelib/global/qglobal.cpp | 22 |
2 files changed, 22 insertions, 3 deletions
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 diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 9cd19ccae9..67d26301a4 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -643,11 +643,29 @@ Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n); */ /*! + \typedef qintptr + \relates <QtGlobal> + + 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 <QtGlobal> - 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 |