Merge 1.9 into master

Change-Id: I9229fc79aeadfbdfe1b7a4817ad58d42fb0a77a0

5 files changed, 129 insertions, 0 deletions

diff --git a/doc/external-resources.qdoc b/doc/external-resources.qdoc
index 2e8ab0cbf..b335fb4a8 100644
--- a/doc/external-resources.qdoc
+++ b/doc/external-resources.qdoc
@@ -26,6 +26,11 @@
 ****************************************************************************/
 
 /*!
+    \externalpage https://developer.apple.com/library/content/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/Optimizing/Optimizing.html#//apple_ref/doc/uid/TP40012302-CH7-SW28
+    \title Adopt the @2x Naming Convention
+*/
+
+/*!
     \externalpage https://login.qt.io/
     \title Qt Account
 */
diff --git a/doc/reference/modules/bundle-module.qdoc b/doc/reference/modules/bundle-module.qdoc
index 956d8fe8b..66949a4c6 100644
--- a/doc/reference/modules/bundle-module.qdoc
+++ b/doc/reference/modules/bundle-module.qdoc
@@ -307,5 +307,11 @@
         \li -
         \li 1.8
         \li This tag is attached to the output artifacts of the rule that produces the bundle.
+    \row
+        \li \c{"infoplist"}
+        \li \c{Info.plist}, \c{*-Info.plist}
+        \li 1.5
+        \li Source files with this tag are Info property lists files or fragments that are merged
+            into the bundle's final Info.plist.
     \endtable
 */
diff --git a/doc/reference/modules/ib-module.qdoc b/doc/reference/modules/ib-module.qdoc
index 656146877..f3d958da1 100644
--- a/doc/reference/modules/ib-module.qdoc
+++ b/doc/reference/modules/ib-module.qdoc
@@ -195,4 +195,53 @@
         \li Directory where the iconutil binary is located.
             This should not normally need to be changed.
     \endtable
+
+    \section1 Relevant File Tags
+
+    \table
+    \header
+        \li Tag
+        \li Auto-tagged File Names
+        \li Since
+        \li Description
+    \row
+        \li \c{"assetcatalog"}
+        \li \c{*.xcassets}
+        \li 1.3
+        \li This tag is attached to directories that will be compiled into compiled asset catalog
+            archives (.car files) on supported platforms, or a collection of loose resource files.
+            The resulting files will be automatically tagged \c{bundle.input}. If the current
+            product is a bundle, the files will be included in the bundle's resources directory.
+    \row
+        \li \c{"iconset"}
+        \li \c{*.iconset}
+        \li 1.3
+        \li This tag is attached to directories that will be compiled into Apple ICNS files.
+            The resulting files will be automatically tagged \c{bundle.input}. If the current
+            product is a bundle, the files will be included in the bundle's resources directory.
+    \row
+        \li \c{"nib"}
+        \li \c{*.nib}, \c{*.xib}
+        \li 1.1
+        \li This tag is attached to "NIB" and "XIB" files that will be compiled.
+            The output may be a flat file or a bundle (directory structure).
+            The resulting files will be automatically tagged \c{bundle.input}. If the current
+            product is a bundle, the files will be included in the bundle's resources directory.
+    \row
+        \li \c{"png"}
+        \li \c{*.png}
+        \li 1.9
+        \li This tag is attached to PNG files that may be converted into multi-resolution TIFFs.
+            Source files should adopt the \l{Adopt the @2x Naming Convention}{@2x naming convention}
+            in order to be properly grouped.
+            The resulting files will be given the \c{tiff} file tag.
+    \row
+        \li \c{"storyboard"}
+        \li \c{*.storyboard}
+        \li 1.3
+        \li This tag is attached to storyboard files that will be compiled.
+            The output may be a flat file or a bundle (directory structure).
+            The resulting files will be automatically tagged \c{bundle.input}. If the current
+            product is a bundle, the files will be included in the bundle's resources directory.
+    \endtable
 */
diff --git a/doc/reference/modules/nsis-module.qdoc b/doc/reference/modules/nsis-module.qdoc
index 20f1174e6..f409d17bc 100644
--- a/doc/reference/modules/nsis-module.qdoc
+++ b/doc/reference/modules/nsis-module.qdoc
@@ -156,4 +156,30 @@
         \li Directory where the compiler binary is located. This should not normally need to be
             changed.
     \endtable
+
+    \section1 Relevant File Tags
+
+    \table
+    \header
+        \li Tag
+        \li Auto-tagged File Names
+        \li Since
+        \li Description
+    \row
+        \li \c{"nsh"}
+        \li \c{*.nsh}
+        \li 1.2
+        \li This tag is attached to NSIS header files.
+    \row
+        \li \c{"nsi"}
+        \li \c{*.nsi}
+        \li 1.2
+        \li This tag is attached to NSIS script files.
+    \row
+        \li \c{"nsissetup"}
+        \li -
+        \li 1.2
+        \li The rule that creates the NSIS setup executable attaches this tag to its output
+            artifact.
+    \endtable
 */
diff --git a/doc/reference/modules/wix-module.qdoc b/doc/reference/modules/wix-module.qdoc
index 2b01d26e5..1a7309654 100644
--- a/doc/reference/modules/wix-module.qdoc
+++ b/doc/reference/modules/wix-module.qdoc
@@ -227,4 +227,47 @@
         \li Directory where the linker binary is located.
             This should not normally need to be changed.
     \endtable
+
+    \section1 Relevant File Tags
+
+    \table
+    \header
+        \li Tag
+        \li Auto-tagged File Names
+        \li Since
+        \li Description
+    \row
+        \li \c{"msi"}
+        \li -
+        \li 1.2
+        \li The rule that creates the Microsoft Installer setup file attaches this tag to its output
+            artifact.
+    \row
+        \li \c{"wixpdb"}
+        \li -
+        \li 1.2
+        \li The rule that creates the Microsoft Installer setup file or WiX setup executable
+            attaches this tag to the associated debug symbol file.
+    \row
+        \li \c{"wixsetup"}
+        \li -
+        \li 1.2
+        \li The rule that creates the WiX setup executable attaches this tag to its output artifact.
+    \row
+        \li \c{"wxi"}
+        \li \c{*.wxi}
+        \li 1.2
+        \li This tag is attached to WiX include files.
+    \row
+        \li \c{"wxl"}
+        \li \c{*.wxl}
+        \li 1.2
+        \li This tag is attached to WiX localization files.
+    \row
+        \li \c{"wxs"}
+        \li \c{*.wxs}
+        \li 1.2
+        \li This tag is attached to WiX source files.
+            Each source file will be compiled into one WiX object file.
+    \endtable
 */