From b63d182dc2ab737a814bdee06f20907bec9c26eb Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 2 Aug 2016 10:44:34 +0200 Subject: Fix attached property linking for Material style Both styles' documentation pages were using e.g. "accent-attached-prop", causing one to unintentionally link to the other. Change-Id: I19bf79781fd4a771ff7ddffeadf71e936d1a7b82 Reviewed-by: J-P Nurmi --- .../doc/src/qtquickcontrols2-material.qdoc | 46 +++++++++++----------- .../doc/src/qtquickcontrols2-universal.qdoc | 34 ++++++++-------- 2 files changed, 40 insertions(+), 40 deletions(-) (limited to 'src/imports/controls/doc/src') diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc index 986dae65..df57bcc9 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc @@ -37,17 +37,17 @@ \section1 Attached Properties \list - \li \l {accent-attached-prop}{\b accent} : color - \li \l {background-attached-prop}{\b background} : color - \li \l {foreground-attached-prop}{\b foreground} : color - \li \l {primary-attached-prop}{\b primary} : color - \li \l {theme-attached-prop}{\b theme} : enumeration + \li \l {material-accent-attached-prop}{\b accent} : color + \li \l {material-background-attached-prop}{\b background} : color + \li \l {material-foreground-attached-prop}{\b foreground} : color + \li \l {material-primary-attached-prop}{\b primary} : color + \li \l {material-theme-attached-prop}{\b theme} : enumeration \endlist \section1 Attached Methods \list - \li color \l {color-attached-method}{\b color}(enumeration predefined, enumeration shade) + \li color \l {material-color-attached-method}{\b color}(enumeration predefined, enumeration shade) \endlist \section1 Detailed Description @@ -72,9 +72,9 @@ \section2 Customization - The Material style allows customizing five attributes, \l {theme-attached-prop}{theme}, - \l {primary-attached-prop}{primary}, \l {accent-attached-prop}{accent}, - \l {foreground-attached-prop}{foreground}, and \l {background-attached-prop}{background}. + The Material style allows customizing five attributes, \l {material-theme-attached-prop}{theme}, + \l {material-primary-attached-prop}{primary}, \l {material-accent-attached-prop}{accent}, + \l {material-foreground-attached-prop}{foreground}, and \l {material-background-attached-prop}{background}. \image qtquickcontrols2-material-attributes.png @@ -144,7 +144,7 @@ \li Description \row \li \c QT_QUICK_CONTROLS_MATERIAL_THEME - \li The value can be one of the available \l {theme-attached-prop}{themes}, + \li The value can be one of the available \l {material-theme-attached-prop}{themes}, for example \c "Dark". \row \li \c QT_QUICK_CONTROLS_MATERIAL_ACCENT @@ -237,7 +237,7 @@ There are several different \l {https://material.google.com/style/color.html#color-color-palette}{shades} of each \l {Pre-defined Colors}{pre-defined color} that can be passed to the - \l {color-attached-method}{Material.color()} function: + \l {material-color-attached-method}{Material.color()} function: \value Material.Shade50 \value Material.Shade100 \value Material.Shade200 @@ -257,8 +257,8 @@ \section1 Attached Property Documentation - \styleproperty {Material.accent} {color} {accent-attached-prop} - \target accent-attached-prop + \styleproperty {Material.accent} {color} {material-accent-attached-prop} + \target material-accent-attached-prop This attached property holds the accent color of the theme. The property can be attached to any window or item. The value is propagated to children. @@ -270,8 +270,8 @@ \endstyleproperty - \styleproperty {Material.background} {color} {background-attached-prop} - \target background-attached-prop + \styleproperty {Material.background} {color} {material-background-attached-prop} + \target material-background-attached-prop This attached property holds the background color of the theme. The property can be attached to any window or item. The value is propagated to children. @@ -279,8 +279,8 @@ \endstyleproperty - \styleproperty {Material.foreground} {color} {foreground-attached-prop} - \target foreground-attached-prop + \styleproperty {Material.foreground} {color} {material-foreground-attached-prop} + \target material-foreground-attached-prop This attached property holds the foreground color of the theme. The property can be attached to any window or item. The value is propagated to children. @@ -288,8 +288,8 @@ \endstyleproperty - \styleproperty {Material.primary} {color} {primary-attached-prop} - \target primary-attached-prop + \styleproperty {Material.primary} {color} {material-primary-attached-prop} + \target material-primary-attached-prop This attached property holds the primary color of the theme. The property can be attached to any window or item. The value is propagated to children. @@ -301,8 +301,8 @@ \endstyleproperty - \styleproperty {Material.theme} {enumeration} {theme-attached-prop} - \target theme-attached-prop + \styleproperty {Material.theme} {enumeration} {material-theme-attached-prop} + \target material-theme-attached-prop This attached property holds whether the theme is light or dark. The property can be attached to any window or item. The value is propagated to children. @@ -314,8 +314,8 @@ \section1 Attached Method Documentation - \stylemethod2 {color} {color} {enumeration} {predefined} {enumeration} {shade} {color-attached-method} - \target color-attached-method + \stylemethod2 {color} {color} {enumeration} {predefined} {enumeration} {shade} {material-color-attached-method} + \target material-color-attached-method This attached method returns the color value of the specified \l {pre-defined colors} {pre-defined color} combined with the given \l {pre-defined colors}{shade}. If omitted, the shade argument defaults to \c Material.Shade500. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index e60cdba2..648193b0 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -37,10 +37,10 @@ \section1 Attached Properties \list - \li \l {accent-attached-prop}{\b accent} : color - \li \l {background-attached-prop}{\b background} : color - \li \l {foreground-attached-prop}{\b foreground} : color - \li \l {theme-attached-prop}{\b theme} : enumeration + \li \l {universal-accent-attached-prop}{\b accent} : color + \li \l {universal-background-attached-prop}{\b background} : color + \li \l {universal-foreground-attached-prop}{\b foreground} : color + \li \l {universal-theme-attached-prop}{\b theme} : enumeration \endlist \section1 Attached Methods @@ -72,9 +72,9 @@ \section2 Customization - The Universal style allows customizing four attributes, \l {theme-attached-prop}{theme}, - \l {accent-attached-prop}{accent}, \l {foreground-attached-prop}{foreground}, and - \l {background-attached-prop}{background}. + The Universal style allows customizing four attributes, \l {universal-theme-attached-prop}{theme}, + \l {universal-accent-attached-prop}{accent}, \l {universal-foreground-attached-prop}{foreground}, and + \l {universal-background-attached-prop}{background}. \image qtquickcontrols2-universal-attributes.png @@ -144,12 +144,12 @@ \li Description \row \li \c QT_QUICK_CONTROLS_UNIVERSAL_THEME - \li The value can be one of the available \l {theme-attached-prop}{themes}, + \li The value can be one of the available \l {universal-theme-attached-prop}{themes}, for example \c "Dark". \row \li \c QT_QUICK_CONTROLS_UNIVERSAL_ACCENT \li The value can be any \l {colorbasictypedocs}{color}, but it is recommended - to use one of the pre-defined \l {accent-attached-prop} {accents}, for + to use one of the pre-defined \l {universal-accent-attached-prop} {accents}, for example \c "Violet". \endtable @@ -172,8 +172,8 @@ \section1 Attached Property Documentation - \styleproperty {Universal.accent} {color} {accent-attached-prop} - \target accent-attached-prop + \styleproperty {Universal.accent} {color} {universal-accent-attached-prop} + \target universal-accent-attached-prop This attached property holds the accent color of the theme. The property can be attached to any window or item. The value is propagated to children. @@ -204,8 +204,8 @@ \endstyleproperty - \styleproperty {Universal.background} {color} {background-attached-prop} - \target background-attached-prop + \styleproperty {Universal.background} {color} {universal-background-attached-prop} + \target universal-background-attached-prop This attached property holds the background color of the theme. The property can be attached to any window or item. The value is propagated to children. @@ -213,15 +213,15 @@ \endstyleproperty - \styleproperty {Universal.foreground} {color} {foreground-attached-prop} - \target foreground-attached-prop + \styleproperty {Universal.foreground} {color} {universal-foreground-attached-prop} + \target universal-foreground-attached-prop This attached property holds the foreground color of the theme. The property can be attached to any window or item. The value is propagated to children. The default value is theme-specific (light or dark). - \styleproperty {Universal.theme} {enumeration} {theme-attached-prop} - \target theme-attached-prop + \styleproperty {Universal.theme} {enumeration} {universal-theme-attached-prop} + \target universal-theme-attached-prop This attached property holds whether the theme is light or dark. The property can be attached to any window or item. The value is propagated to children. -- cgit v1.2.3