summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-09-12 12:09:12 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-09-12 12:09:32 (GMT)
commit2321b88edf18caa2b5f246df8b126d32b50b7535 (patch)
tree387ea7ec3ed0e8719098e77bd580a6ab5f43d8d1 /Help
parent8ae543d85c536711b4bdff98d2da9805cd6c3e51 (diff)
parent5b8fa21512fa4b283847aea4bcd3be43e6fce7b7 (diff)
downloadCMake-2321b88edf18caa2b5f246df8b126d32b50b7535.zip
CMake-2321b88edf18caa2b5f246df8b126d32b50b7535.tar.gz
CMake-2321b88edf18caa2b5f246df8b126d32b50b7535.tar.bz2
Merge topic 'cpack-ifw-product-images'
5b8fa21512 Tests: Add a test covering the CPack IFW Generator 3331c7032f CPack/IFW: Add option for ProductImages URLs d58f90f628 CPack/IFW: Actually ignore missing ProductImages 3c214f2638 CPack/IFW: Fix generation of ProductImages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9798
Diffstat (limited to 'Help')
-rw-r--r--Help/cpack_gen/ifw.rst10
-rw-r--r--Help/release/dev/cpack-ifw-product-images.rst8
2 files changed, 18 insertions, 0 deletions
diff --git a/Help/cpack_gen/ifw.rst b/Help/cpack_gen/ifw.rst
index c252095..68f8792 100644
--- a/Help/cpack_gen/ifw.rst
+++ b/Help/cpack_gen/ifw.rst
@@ -275,6 +275,16 @@ Package
This feature is available for QtIFW 4.0.0 and later.
+.. variable:: CPACK_IFW_PACKAGE_PRODUCT_IMAGE_URLS
+
+ .. versionadded:: 3.31
+
+ A list of URLs associated with the ProductImages.
+ Only used if ``CPACK_IFW_PACKAGE_PRODUCT_IMAGES`` is defined
+ and it has the same size.
+
+ This feature is available for QtIFW 4.0.0 and later.
+
.. variable:: CPACK_IFW_PACKAGE_RUN_PROGRAM
.. versionadded:: 3.23
diff --git a/Help/release/dev/cpack-ifw-product-images.rst b/Help/release/dev/cpack-ifw-product-images.rst
new file mode 100644
index 0000000..c598124
--- /dev/null
+++ b/Help/release/dev/cpack-ifw-product-images.rst
@@ -0,0 +1,8 @@
+cpack-ifw-product-images
+------------------------
+
+* The :cpack_gen:`CPack IFW Generator` gained the new
+ :variable:`CPACK_IFW_PACKAGE_PRODUCT_IMAGE_URLS` variable to
+ specify images associated with entries of
+ :variable:`CPACK_IFW_PACKAGE_PRODUCT_IMAGES`.
+ This feature is available for QtIFW 4.0 and newer.