diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-02-17 13:53:44 +0100 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@theqtcompany.com> | 2015-03-02 13:52:13 +0000 |
| commit | f0c227f8a9a5c5e3ed83f86702626092457175aa (patch) | |
| tree | 9d5903b76206906a7dc5abff7a8c06bfcfc3f129 /src/controls/doc/images | |
| parent | b80076c53c045076afdba44a975a533d130a7b60 (diff) | |
| download | qtquickcontrols-f0c227f8a9a5c5e3ed83f86702626092457175aa.tar.gz | |
Merge Extras' styling system into Controls'.
- Removes the duplicated style settings functionality in Extras and
simplifies the installed styles directory structure.
- Extras' Base style is now part of Controls' Base style, eliminating
the need for a separate QtQuick.Extras.Styles import. The cost of
doing this should be negligible: a few QML files and two images.
If we didn't merge Extras' Baste style into Controls', we'd need
extras-specific code in qquickcontrolssettings, as the default style
search path is:
qml/QtQuick/Controls/Styles/
Whereas the Extras Base style would be in:
qml/QtQuick/Extras/Styles/
The Extras Base style can't go into Controls' Base style directory,
either, because otherwise we'd have two qmldir files there.
The Flat style doesn't have this problem because it is all contained
in one plugin and gets installed into its own Flat/ folder.
- Documentation now lists the Extras controls as \since QtQuick.Extras
1.4.
- Adds the customcontrolsstyle auto test to ensure that custom styling
is tested.
Change-Id: I19ca7a8b7e1c1daa85b272f4ccf9a2f05c76e0d9
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/doc/images')
20 files changed, 0 insertions, 0 deletions
diff --git a/src/controls/doc/images/circulargauge-angles.png b/src/controls/doc/images/circulargauge-angles.png Binary files differnew file mode 100644 index 00000000..fb93bcaa --- /dev/null +++ b/src/controls/doc/images/circulargauge-angles.png diff --git a/src/controls/doc/images/circulargauge-needle-example-2.png b/src/controls/doc/images/circulargauge-needle-example-2.png Binary files differnew file mode 100644 index 00000000..a2b5f322 --- /dev/null +++ b/src/controls/doc/images/circulargauge-needle-example-2.png diff --git a/src/controls/doc/images/circulargauge-needle.png b/src/controls/doc/images/circulargauge-needle.png Binary files differnew file mode 100644 index 00000000..b2780b41 --- /dev/null +++ b/src/controls/doc/images/circulargauge-needle.png diff --git a/src/controls/doc/images/circulargauge-reversed.png b/src/controls/doc/images/circulargauge-reversed.png Binary files differnew file mode 100644 index 00000000..aeadfbcc --- /dev/null +++ b/src/controls/doc/images/circulargauge-reversed.png diff --git a/src/controls/doc/images/circulargauge-tickmark-indices-values.png b/src/controls/doc/images/circulargauge-tickmark-indices-values.png Binary files differnew file mode 100644 index 00000000..d117f483 --- /dev/null +++ b/src/controls/doc/images/circulargauge-tickmark-indices-values.png diff --git a/src/controls/doc/images/gauge-minorTickmark-example.png b/src/controls/doc/images/gauge-minorTickmark-example.png Binary files differnew file mode 100644 index 00000000..591120d6 --- /dev/null +++ b/src/controls/doc/images/gauge-minorTickmark-example.png diff --git a/src/controls/doc/images/gauge-temperature.png b/src/controls/doc/images/gauge-temperature.png Binary files differnew file mode 100644 index 00000000..95fc1679 --- /dev/null +++ b/src/controls/doc/images/gauge-temperature.png diff --git a/src/controls/doc/images/gauge-tickmark-example.png b/src/controls/doc/images/gauge-tickmark-example.png Binary files differnew file mode 100644 index 00000000..c46fb8a5 --- /dev/null +++ b/src/controls/doc/images/gauge-tickmark-example.png diff --git a/src/controls/doc/images/piemenu-menuitem-example.png b/src/controls/doc/images/piemenu-menuitem-example.png Binary files differnew file mode 100644 index 00000000..57a2f956 --- /dev/null +++ b/src/controls/doc/images/piemenu-menuitem-example.png diff --git a/src/controls/doc/images/styling-circulargauge-background-example.png b/src/controls/doc/images/styling-circulargauge-background-example.png Binary files differnew file mode 100644 index 00000000..e816c6f6 --- /dev/null +++ b/src/controls/doc/images/styling-circulargauge-background-example.png diff --git a/src/controls/doc/images/styling-circulargauge-knob-example.png b/src/controls/doc/images/styling-circulargauge-knob-example.png Binary files differnew file mode 100644 index 00000000..793a36c2 --- /dev/null +++ b/src/controls/doc/images/styling-circulargauge-knob-example.png diff --git a/src/controls/doc/images/styling-circulargauge-minorTickmark-example.png b/src/controls/doc/images/styling-circulargauge-minorTickmark-example.png Binary files differnew file mode 100644 index 00000000..f3f2d8d7 --- /dev/null +++ b/src/controls/doc/images/styling-circulargauge-minorTickmark-example.png diff --git a/src/controls/doc/images/styling-circulargauge-needle-example.png b/src/controls/doc/images/styling-circulargauge-needle-example.png Binary files differnew file mode 100644 index 00000000..08049fc9 --- /dev/null +++ b/src/controls/doc/images/styling-circulargauge-needle-example.png diff --git a/src/controls/doc/images/styling-circulargauge-tickmark-example.png b/src/controls/doc/images/styling-circulargauge-tickmark-example.png Binary files differnew file mode 100644 index 00000000..01c71cd1 --- /dev/null +++ b/src/controls/doc/images/styling-circulargauge-tickmark-example.png diff --git a/src/controls/doc/images/styling-circulargauge-tickmarkLabel-example.png b/src/controls/doc/images/styling-circulargauge-tickmarkLabel-example.png Binary files differnew file mode 100644 index 00000000..7520827e --- /dev/null +++ b/src/controls/doc/images/styling-circulargauge-tickmarkLabel-example.png diff --git a/src/controls/doc/images/styling-gauge-font-size.png b/src/controls/doc/images/styling-gauge-font-size.png Binary files differnew file mode 100644 index 00000000..97d7ebb2 --- /dev/null +++ b/src/controls/doc/images/styling-gauge-font-size.png diff --git a/src/controls/doc/images/styling-gauge-foreground.png b/src/controls/doc/images/styling-gauge-foreground.png Binary files differnew file mode 100644 index 00000000..5a4f65b9 --- /dev/null +++ b/src/controls/doc/images/styling-gauge-foreground.png diff --git a/src/controls/doc/images/styling-gauge-minorTickmark.png b/src/controls/doc/images/styling-gauge-minorTickmark.png Binary files differnew file mode 100644 index 00000000..34e36192 --- /dev/null +++ b/src/controls/doc/images/styling-gauge-minorTickmark.png diff --git a/src/controls/doc/images/styling-gauge-tickmark.png b/src/controls/doc/images/styling-gauge-tickmark.png Binary files differnew file mode 100644 index 00000000..1cd4fb8b --- /dev/null +++ b/src/controls/doc/images/styling-gauge-tickmark.png diff --git a/src/controls/doc/images/styling-gauge-valueBar.png b/src/controls/doc/images/styling-gauge-valueBar.png Binary files differnew file mode 100644 index 00000000..581b8240 --- /dev/null +++ b/src/controls/doc/images/styling-gauge-valueBar.png |
