diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2021-10-26 15:27:05 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2021-10-26 17:10:13 +0200 |
| commit | 501e9bf49310a01b2927cf7c55b2deefbf68337a (patch) | |
| tree | c2bae155c87ded2ad146492358f748ea7f73805c | |
| parent | 1a2f7ae1166a9a439531101a2e263e5fc160d0b3 (diff) | |
Fix broken qdoc links to qtbase
Change-Id: I53347b12684fa591326762dbce1fc5a6b74ea136
Pick-to: 6.2
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
| -rw-r--r-- | doc/configuration.qdoc | 4 | ||||
| -rw-r--r-- | doc/manifest-old.qdoc | 2 | ||||
| -rw-r--r-- | doc/manifest.qdoc | 2 | ||||
| -rw-r--r-- | doc/resources.qdoc | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/configuration.qdoc b/doc/configuration.qdoc index 96e76a8e..841dd45d 100644 --- a/doc/configuration.qdoc +++ b/doc/configuration.qdoc @@ -239,7 +239,7 @@ or across multiple config files, the final value is resolved based on these rule \li [\c ui/resources] \li array<string> \li Takes a list of \l{The Qt Resource System}{Qt resource} files (.rcc) or libraries that - have resources \l{Compiled-In Resources}{compiled-in} and registers them within the + have resources \l{Resource Collection Files}{compiled-in} and registers them within the System UI process. Resources can be accessed with the ":" or "qrc://" file path prefix. \row \li [\c plugins] @@ -597,7 +597,7 @@ an additional column specifying which runtime a configuration option applies to: \li qml \li array<string> \li Takes a list of \l{The Qt Resource System}{Qt resource} files (.rcc) or libraries that - have resources \l{Compiled-In Resources}{compiled-in} and registers them within each + have resources \l{Resource Collection Files}{compiled-in} and registers them within each QML runtime. Consequently, all running QML applications will include these resources. The resources can be accessed with the ":" or "qrc://" file path prefix. \row diff --git a/doc/manifest-old.qdoc b/doc/manifest-old.qdoc index 573830f3..bbd10343 100644 --- a/doc/manifest-old.qdoc +++ b/doc/manifest-old.qdoc @@ -281,7 +281,7 @@ that specifies which runtime a configuration option applies to: \li qml, qml-in-process \li array<string> \li Takes a list of \l{The Qt Resource System}{Qt resource} files (.rcc) or libraries that have - resources \l{Compiled-In Resources}{compiled-in} and registers them within the application + resources \l{Resource Collection Files}{compiled-in} and registers them within the application process. Resources can be accessed with the ":" or "qrc://" file path prefix. \row \li \c pluginPaths diff --git a/doc/manifest.qdoc b/doc/manifest.qdoc index 14c9790d..95ca14c9 100644 --- a/doc/manifest.qdoc +++ b/doc/manifest.qdoc @@ -345,7 +345,7 @@ that specifies which runtime a configuration option applies to: \li qml, qml-in-process \li list<string> \li Takes a list of \l{The Qt Resource System}{Qt resource} files (.rcc) or libraries that have - resources \l{Compiled-In Resources}{compiled-in} and registers them within the application + resources \l{Resource Collection Files}{compiled-in} and registers them within the application process. Resources can be accessed with the ":" or "qrc://" file path prefix. \row \li \c pluginPaths diff --git a/doc/resources.qdoc b/doc/resources.qdoc index 126c5c66..159de477 100644 --- a/doc/resources.qdoc +++ b/doc/resources.qdoc @@ -40,8 +40,8 @@ multi-process modes. \section1 Compile Resources -You can add resources as \l{External Binary Resources}{external binary resources} or as -\l{Compiled-In Resources}{compiled-in resources}; both are generated from a \c .qrc file. +You can add resources as \l{External Resource Files}{external binary resources} or as +\l{Resource Collection Files}{compiled-in resources}; both are generated from a \c .qrc file. Typically, external binary resources are stored in a file with the \c .rcc extension, whereas compiled-in resources are stored in libraries in the Application Manager context. |