diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2021-05-28 12:58:33 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2021-06-01 11:44:43 +0000 |
| commit | bee6f9168689b0b3659f9f13da2cb5ba2d7e01f4 (patch) | |
| tree | 49e3b7d845caf24af990bde7f51f9257f0caa969 /src/corelib/doc | |
| parent | 96afaf41ca30fc77f92b0ad01e65c767a944354a (diff) | |
Doc: QtCore: Fix documentation issues
* Add module header wrapper that loads the real QtCore header and
qandroidextras_p.h to generate docs for those types
* Add missing dummy typedefs to doc/include/jni.h
* Use the correct \namespace name (QtAndroidPrivate) and mark it
as \preliminary
* Add missing 'const' specifier for Q[Untyped]Bindable methods
* Drop documentation for removed method QProperty::markDirty()
* qmath.h: Fix \fn commands for qFloor(), qCeil()
* QHashSeed: Drop incorrect usage of \relates
Fixes: QTBUG-93942
Task-number: QTBUG-93995
Change-Id: If76b5aa4b79a64add3cb6275eac82ec44ef10319
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/corelib/doc')
| -rw-r--r-- | src/corelib/doc/include/QtCoreDoc | 2 | ||||
| -rw-r--r-- | src/corelib/doc/include/jni.h | 2 | ||||
| -rw-r--r-- | src/corelib/doc/qtcore.qdocconf | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/doc/include/QtCoreDoc b/src/corelib/doc/include/QtCoreDoc new file mode 100644 index 0000000000..3dc7ce46e5 --- /dev/null +++ b/src/corelib/doc/include/QtCoreDoc @@ -0,0 +1,2 @@ +#include <QtCore/QtCore> +#include "../../platform/android/qandroidextras_p.h" diff --git a/src/corelib/doc/include/jni.h b/src/corelib/doc/include/jni.h index 09186969dd..03b289a229 100644 --- a/src/corelib/doc/include/jni.h +++ b/src/corelib/doc/include/jni.h @@ -58,5 +58,7 @@ struct _jclass; typedef _jclass* jclass; struct _jobject; typedef _jobject* jobject; +typedef int jint; +typedef int jmethodID; typedef void* JavaVM; #endif diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf index 3699bc84c3..750c5d2762 100644 --- a/src/corelib/doc/qtcore.qdocconf +++ b/src/corelib/doc/qtcore.qdocconf @@ -5,6 +5,7 @@ project = QtCore description = Qt Core Reference Documentation version = $QT_VERSION +moduleheader = QtCoreDoc includepaths += ./include examplesinstallpath = corelib |