summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobalstatic.qdoc
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2018-10-31 13:49:14 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2018-11-06 12:43:26 +0000
commitec1548ae122af2febfc61c0242025ee52c8cbc30 (patch)
tree12b4afa9886ad4065ca672e5927f6814ff2412cf /src/corelib/global/qglobalstatic.qdoc
parent8828993c4405a8aa98f11318151a74b352eb5521 (diff)
Doc: Fix various documentation warnings
These include typos, marking functions as \internal, documenting trivial things, and fixing the function signatures passed to the \fn command. Task-number: QTBUG-71502 Change-Id: I24a9e1f7e1cdb39e5c31b99202bdd593c6b789ff Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/global/qglobalstatic.qdoc')
-rw-r--r--src/corelib/global/qglobalstatic.qdoc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/corelib/global/qglobalstatic.qdoc b/src/corelib/global/qglobalstatic.qdoc
index dbea04ecab..e7935d5a9b 100644
--- a/src/corelib/global/qglobalstatic.qdoc
+++ b/src/corelib/global/qglobalstatic.qdoc
@@ -435,6 +435,7 @@
*/
/*!
+ \keyword qglobalstatic-operator-type-ptr
\fn template <typename T, T *(&innerFunction)(), QBasicAtomicInt &guard> QGlobalStatic<T, innerFunction, guard>::operator Type*()
This function returns the address of the contents of this global static. If
@@ -476,10 +477,11 @@
by this function. If the contents have already been destroyed, this
function will return a null pointer.
- This function is equivalent to \l {operator Type *()}. It is provided for
- compatibility with the private Q_GLOBAL_STATIC implementation that existed
- in Qt 4.x and 5.0. New code should avoid using it and should instead treat
- the object as a smart pointer.
+ This function is equivalent to \l {qglobalstatic-operator-type-ptr}
+ {operator Type *()}. It is provided for compatibility with the private
+ Q_GLOBAL_STATIC implementation that existed in Qt 4.x and 5.0. New code
+ should avoid using it and should instead treat the object as a smart
+ pointer.
*/
/*!