diff options
| author | Amir Masoud Abdol <amirmasoudabdol@icloud.com> | 2022-10-13 13:01:56 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amirmasoudabdol@icloud.com> | 2022-10-25 16:39:25 +0200 |
| commit | 2625e5f050b2bedb4aa9ff9307e90c1e3ba85e8e (patch) | |
| tree | fbebb3066a1ebdfaf1f828547575fc8737be005a /src/corelib/doc | |
| parent | 30eac4a4f9df0b7402fe70499be9385e7ee8737e (diff) | |
Make the `PREFIX` Parameter of the `qt_add_resources` Optional
The `rcc_PREFIX` will be set to `/` if it is not passed to the
function and it is not defined in `QT_RESOURCE_PREFIX`.
I also removed an unnecessary check of the `rcc_PREFIX`.
[ChangeLog][QtCore][CMake] The `PREFIX` parameter of the
`qt_add_resources` is now optional. If not passed, and
`QT_RESOURCE_PREFIX` is not defined, `/` will be used as the path
prefix.
Fixes: QTBUG-104938
Change-Id: I6524ab5dc54f035272e4c2e3154eb67591efb650
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'src/corelib/doc')
| -rw-r--r-- | src/corelib/doc/src/cmake/qt_add_resources.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/doc/src/cmake/qt_add_resources.qdoc b/src/corelib/doc/src/cmake/qt_add_resources.qdoc index 8a61ec769e..5c4059f2cd 100644 --- a/src/corelib/doc/src/cmake/qt_add_resources.qdoc +++ b/src/corelib/doc/src/cmake/qt_add_resources.qdoc @@ -57,7 +57,9 @@ See \l{The Qt Resource System} for a general description of Qt resources. \c PREFIX specifies a path prefix under which all files of this resource are accessible from C++ code. This corresponds to the XML attribute \c prefix of the \c .qrc file format. If \c PREFIX is not given, the target property -\l{cmake-target-property-QT_RESOURCE_PREFIX}{QT_RESOURCE_PREFIX} is used. +\l{cmake-target-property-QT_RESOURCE_PREFIX}{QT_RESOURCE_PREFIX} is used. Since +6.5, \c{PREFIX} is optional. If it is omitted and not specified by +\c{QT_RESOURCE_PREFIX}, \c{"/"} will be used as the default path prefix. \c LANG specifies the locale of this resource. This corresponds to the XML attribute \c lang of the \c .qrc file format. |