diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2016-08-19 15:42:00 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-08-19 14:11:47 +0000 |
| commit | dd5f02754320086797e83bb77418c995d6b4d522 (patch) | |
| tree | dbeb8de45d9db41875ffd1d0b490e4e37114e5f4 /tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc | |
| parent | c3ea95281f30be06ee016451d300365ae600ee1c (diff) | |
Material: ensure setting background/foreground works
- Add hasGlobalForeground and hasGlobalBackground. These are set
to true when a foreground/background color is specified via settings
(qtquickcontrols2.conf file or environment variables), and then used
to initialize each attached style object's m_hasForeground and
m_hasBackground property.
- Add tst_qquickmaterialstyleconf auto test to ensure that global
settings are respected.
Change-Id: I436773e355c6d470215fb9cfe8fbff402d2979d9
Task-number: QTBUG-55366
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc')
| -rw-r--r-- | tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc b/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc new file mode 100644 index 00000000..53ba6450 --- /dev/null +++ b/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>qtquickcontrols2.conf</file> +</qresource> +</RCC> |