1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc: Move \target command to inside table cell

Browse Source 
`\target`s generate a span where they occur. If they occur outside a
table cell, QDoc generates illformed html. Fix such instances by moving
the offending line into the table cell they target.

Task-number: QTBUG-115247
Change-Id: I677e909ec73a6d0af8195d88d23581d8dd97c6e5
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
(cherry picked from commit 78bc1a9a25602ba898b1f84a6c41c3804758f6cd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Paul Wicking 2023-08-01 14:23:09 +02:00 committed by Qt Cherry-pick Bot
parent 69eec3cd48
commit 326240ef79
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/android/templates/doc/src/android-manifest-file-configuration.qdoc
View File

@ -148,8 +148,7 @@ The following is a list of such meta-data defined by Qt:
\li Meta-data Name \li Meta-data Name
\li Description \li Description
\row \row
\target android.app.lib_name \li android.app.lib_name \target android.app.lib_name
\li android.app.lib_name
\li The filename of the native C++ library that is used by the activity. \li The filename of the native C++ library that is used by the activity.
\note This attribute is mandatory and shouldn't be removed. \note This attribute is mandatory and shouldn't be removed.
Default value is the Qt project's target name. Default value is the Qt project's target name.
@ -159,8 +158,7 @@ The following is a list of such meta-data defined by Qt:
For more information, see \l {Style Extraction}. For more information, see \l {Style Extraction}.
The default value is \c minimal. The default value is \c minimal.
\row \row
\target android.app.background_running \li android.app.background_running \target android.app.background_running
\li android.app.background_running
\li Sets whether the app keeps running tasks in the background. \li Sets whether the app keeps running tasks in the background.
Setting this to \c true is the equivalent of setting the environment Setting this to \c true is the equivalent of setting the environment
variable \c QT_BLOCK_EVENT_LOOPS_WHEN_SUSPENDED to \c 0. variable \c QT_BLOCK_EVENT_LOOPS_WHEN_SUSPENDED to \c 0.
@ -170,8 +168,7 @@ The following is a list of such meta-data defined by Qt:
application tries to draw after \l {QGuiApplication::applicationStateChanged()} application tries to draw after \l {QGuiApplication::applicationStateChanged()}
signal is sent with a \l {Qt::ApplicationSuspended} state. signal is sent with a \l {Qt::ApplicationSuspended} state.
\row \row
\target android.app.arguments \li android.app.arguments \target android.app.arguments
\li android.app.arguments
\li Sets a list of arguments to pass to the app \c {"arg1 arg2"}. \li Sets a list of arguments to pass to the app \c {"arg1 arg2"}.
Populated from \c ANDROID_APPLICATION_ARGUMENTS (qmake) and Populated from \c ANDROID_APPLICATION_ARGUMENTS (qmake) and
\c QT_ANDROID_APPLICATION_ARGUMENTS (CMake). \c QT_ANDROID_APPLICATION_ARGUMENTS (CMake).
@ -218,8 +215,7 @@ the \c <application> section:
\li Meta-data Name \li Meta-data Name
\li Description \li Description
\row \row
\target android.app.system_libs_prefix \li android.app.system_libs_prefix \target android.app.system_libs_prefix
\li android.app.system_libs_prefix
\li Specifies a custom system library path to use for library loading lookup. \li Specifies a custom system library path to use for library loading lookup.
This is necessary when using Qt libraries installed outside an app's This is necessary when using Qt libraries installed outside an app's
default native (JNI) library directory. default native (JNI) library directory.