2 files changed, 99 insertions, 0 deletions
diff --git a/src/imports/controls/doc/src/includes/qquickicon.qdocinc b/src/imports/controls/doc/src/includes/qquickicon.qdocinc
new file mode 100644
index 00000000..a6ab90bb
--- /dev/null
+++ b/src/imports/controls/doc/src/includes/qquickicon.qdocinc
@@ -0,0 +1,42 @@
+//! [grouped-properties]
+\table
+\header
+    \li Name
+    \li Description
+\row
+    \li name
+    \li This property holds the name of the icon to use.
+
+    The icon will be loaded from the platform theme. If the icon is found
+    in the theme, it will always be used; even if \l icon.source is also set.
+    If the icon is not found, \l icon.source will be used instead.
+
+    For more information on theme icons, see \l {QIcon::fromTheme()}.
+\row
+    \li source
+    \li This property holds the name of the icon to use.
+
+    The icon will be loaded as a regular image.
+
+    If \l icon.name is set and refers to a valid theme icon, it will always
+    be used instead of this property.
+\row
+    \li width
+    \li This property holds the width of the icon.
+
+        The icon's width will never exceed this value, though it will
+        shrink when necessary.
+\row
+    \li height
+    \li This property holds the height of the icon.
+
+        The icon's height will never exceed this value, though it will
+        shrink when necessary.
+\row
+    \li color
+    \li This property holds the color of the icon.
+
+        The icon is tinted with the specified color, unless the color is
+        set to \c "transparent".
+\endtable
+//! [grouped-properties]
diff --git a/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc b/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc
new file mode 100644
index 00000000..f6fe5a97
--- /dev/null
+++ b/src/imports/controls/doc/src/includes/qquickimaginestyle.qdocinc
@@ -0,0 +1,57 @@
+//! [conf]
+\table
+    \header
+        \li Variable
+        \li Description
+    \row
+        \li \c Path
+        \li Specifies the \l {imagine-path-attached-prop}{path} to the directory that contains
+        the Imagine style assets. If not specified, the built-in assets are used.
+
+        For example, to specify a path to a directory stored in the
+        \l {The Qt Resource System}{resource system}:
+
+        \badcode
+        [Imagine]
+        Path=:/imagine-assets
+        \endcode
+
+        To specify a relative path to a local directory:
+
+        \badcode
+        [Imagine]
+        Path=imagine-assets
+        \endcode
+
+        \note Due to a technical limitation, the path should not be named
+              \e "imagine" if it is relative to the \c qtquickcontrols2.conf file.
+\endtable
+//! [conf]
+
+//! [env]
+\table
+    \header
+        \li Variable
+        \li Description
+    \row
+        \li \c QT_QUICK_CONTROLS_IMAGINE_PATH
+        \li Specifies the path to the directory that contains the Imagine style assets.
+            If not specified, the built-in assets are used.
+
+            For example, to specify a path to a directory stored in the
+            \l {The Qt Resource System}{resource system}:
+
+            \badcode
+            QT_QUICK_CONTROLS_IMAGINE_PATH=:/imagine-assets
+            \endcode
+
+            To specify a relative path to a local directory:
+
+            \badcode
+            QT_QUICK_CONTROLS_IMAGINE_PATH=imagine-assets
+            \endcode
+
+            \note Due to a technical limitation, the path should not be named
+                  \e "imagine" if it is relative to the \c qtquickcontrols2.conf file.
+\endtable
+//! [env]