diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-14 12:09:39 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-14 12:09:39 +0200 |
commit | a6ca9472de6d4cbdb85dfceaa4f8c10b243cea07 (patch) | |
tree | 719e2c3a1732ab0cc82c32d560484b5740f40a05 /src/imports | |
parent | 658b0f610a71fab8c103b913d2cfd11c3c7c6bef (diff) | |
parent | b3619f32c20b5851ada0826ec2e7ddc2ec8a210b (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/quicktemplates2/qquicktextarea_p_p.h
src/quicktemplates2/qquicktextfield_p_p.h
Change-Id: Ie7b4a114ad27a4cad337c91e8ebcf696b0e845d7
Diffstat (limited to 'src/imports')
5 files changed, 47 insertions, 36 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc index bbdf7f89..5cb7a9a5 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc @@ -300,6 +300,9 @@ \li \l [QML QtQuickControls] {Slider} \li \l [QML QtQuickControls2] {Slider} \row + \li \l [QML QtQuickControls] {SplitView} + \li \mdash + \row \li \l [QML QtQuickControls] {SpinBox} \li \l [QML QtQuickControls2] {SpinBox} \row diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 1155032b..1fadfd75 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -82,7 +82,9 @@ \section1 Examples \list - \li \l{Qt Quick Controls 2 Examples} + \li \l{Qt Quick Controls 2 - Gallery}{Gallery} + \li \l{Qt Quick Controls 2 - Chat Tutorial}{Chat Tutorial} + \li \l{Qt Quick Controls 2 Examples}{All Examples} \endlist \section1 Related Modules diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc index 5685a852..eed4efe8 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc @@ -151,22 +151,19 @@ \row \li \c QT_QUICK_CONTROLS_MATERIAL_ACCENT \li The value can be any \l {colorbasictypedocs}{color}, but it is recommended - to use one of the \l {Pre-defined Colors}{pre-defined colors}, for example - for example \c "Teal". + to use one of the \l {pre-defined Material colors}, for example \c "Teal". \row \li \c QT_QUICK_CONTROLS_MATERIAL_PRIMARY \li The value can be any \l {colorbasictypedocs}{color}, but it is recommended - to use one of the \l {Pre-defined Colors}{pre-defined colors}, for example - for example \c "BlueGrey". + to use one of the \l {pre-defined Material colors}, for example \c "BlueGrey". \row \li \c QT_QUICK_CONTROLS_MATERIAL_FOREGROUND \li The value can be any \l {colorbasictypedocs}{color}, or one of the - \l {Pre-defined Colors}{pre-defined colors}. - + \l {pre-defined Material colors}. \row \li \c QT_QUICK_CONTROLS_MATERIAL_BACKGROUND \li The value can be any \l {colorbasictypedocs}{color}, or one of the - \l {Pre-defined Colors}{pre-defined colors}. + \l {pre-defined Material colors}. \endtable \section2 Dependency @@ -184,7 +181,7 @@ style-specific tweaks can be applied without creating a hard dependency to a style. - \section2 Pre-defined Colors + \section2 Pre-defined Material Colors Even though primary and accent can be any \l {colorbasictypedocs}{color}, it is recommended to use one of the pre-defined colors that have been designed @@ -238,8 +235,8 @@ 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 {material-color-attached-method}{Material.color()} function: + of each \l {Pre-defined Material Colors}{pre-defined color} that can be passed + to the \l {material-color-attached-method}{Material.color()} function: \value Material.Shade50 \value Material.Shade100 \value Material.Shade200 @@ -267,8 +264,8 @@ The default value is \c Material.Pink. \note Even though the accent can be any \l {colorbasictypedocs}{color}, it is - recommended to use one of the \l {pre-defined colors} that have been designed - to work well with the rest of the Material style palette. + recommended to use one of the \l {pre-defined Material colors} that have been + designed to work well with the rest of the Material style palette. \endstyleproperty @@ -308,8 +305,8 @@ The default value is \c Material.Indigo. \note Even though the primary can be any \l {colorbasictypedocs}{color}, it is - recommended to use one of the \l {pre-defined colors} that have been designed - to work well with the rest of the Material style palette. + recommended to use one of the \l {pre-defined Material colors} that have been + designed to work well with the rest of the Material style palette. \endstyleproperty @@ -333,9 +330,10 @@ \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. + This attached method returns the effective color value of the specified + \l {pre-defined Material colors}{pre-defined Material color} combined with + the given \l {pre-defined shades}{shade}. If omitted, the shade argument + defaults to \c Material.Shade500. \qml import QtQuick 2.0 diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index cb6ac17e..c3e75185 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -150,8 +150,15 @@ \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 {universal-accent-attached-prop} {accents}, for - example \c "Violet". + to use one of the \l {pre-defined Universal colors}, for example \c "Violet". + \row + \li \c QT_QUICK_CONTROLS_UNIVERSAL_FOREGROUND + \li The value can be any \l {colorbasictypedocs}{color}, or one of the + \l {pre-defined Universal colors}. + \row + \li \c QT_QUICK_CONTROLS_UNIVERSAL_BACKGROUND + \li The value can be any \l {colorbasictypedocs}{color}, or one of the + \l {pre-defined Universal colors}. \endtable \section2 Dependency @@ -169,19 +176,9 @@ style-specific tweaks can be applied without creating a hard dependency to a style. - \b {See also} \l {Default Style}, \l {Material Style} - - \section1 Attached Property Documentation - - \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. - - Even though the accent can be any \l {colorbasictypedocs}{color}, it is - recommended to use one of the pre-defined accents that have been designed - to work well with the rest of the Universal style palette: + \section2 Pre-defined Universal Colors + Available pre-defined colors: \value Universal.Lime \stylecolor {#A4C400} {} \value Universal.Green \stylecolor {#60A917} {} \value Universal.Emerald \stylecolor {#008A00} {} @@ -203,6 +200,19 @@ \value Universal.Mauve \stylecolor {#76608A} {} \value Universal.Taupe \stylecolor {#87794E} {} + \b {See also} \l {Default Style}, \l {Material Style} + + \section1 Attached Property Documentation + + \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. + + \note Even though the accent can be any \l {colorbasictypedocs}{color}, it is + recommended to use one of the \l {pre-defined Universal colors} that have been + designed to work well with the rest of the Universal style palette. + \endstyleproperty \styleproperty {Universal.background} {color} {universal-background-attached-prop} @@ -241,8 +251,8 @@ \stylemethod {color} {color} {enumeration} {predefined} {color-attached-method} \target color-attached-method - This attached method returns the color value of the specified \l {pre-defined colors} - {pre-defined color}. + This attached method returns the effective color value of the specified + \l {pre-defined Universal colors}{pre-defined Universal color}. \qml import QtQuick 2.0 diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index e6e4fe05..6ff779a5 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -53,8 +53,6 @@ QT_BEGIN_NAMESPACE -class QQuickMaterialStylePrivate; - class QQuickMaterialStyle : public QQuickStyleAttached { Q_OBJECT |