diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-14 11:34:22 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-14 10:40:09 +0000 |
| commit | 70a31cdafbdb3f018e10465ccb9a481d6fa54ab5 (patch) | |
| tree | af5ef4c20223bf17a55ca00e18589c34630d9ad7 /tests | |
| parent | c08c717225e3c5387dd5f03cf42a7473403142ae (diff) | |
Improve Material & Universal warnings
Before:
QQuickMaterialStyle: unknown accent "foo"
After:
qrc:/main.qml:28:9: QML CheckBox: unknown Material.accent value: foo
Furthermore, before invalid values in :/qtlabscontrols.conf were silently
ignored. Now it gives a clear warning:
:/qtlabscontrols.conf: unknown Material theme value: foo
Change-Id: I0be4eb26ffe23643e282197dc76a091801ab2f4d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/material/data/tst_material.qml | 10 | ||||
| -rw-r--r-- | tests/auto/universal/data/tst_universal.qml | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/material/data/tst_material.qml b/tests/auto/material/data/tst_material.qml index 2e2f58de..6bd99547 100644 --- a/tests/auto/material/data/tst_material.qml +++ b/tests/auto/material/data/tst_material.qml @@ -260,8 +260,8 @@ TestCase { compare(control.Material.accent, "#f44336") // Material.Accent - string - control.Material.accent = "Emerald" - compare(control.Material.accent, "#f44336") + control.Material.accent = "BlueGrey" + compare(control.Material.accent, "#607d8b") // SVG named color control.Material.accent = "tomato" @@ -284,11 +284,11 @@ TestCase { compare(control.Material.accent, "#80808080") // unknown - ignoreWarning("QQuickMaterialStyle: unknown accent 123") + ignoreWarning(Qt.resolvedUrl("tst_material.qml") + ":57:9: QML Button: unknown Material.accent value: 123") control.Material.accent = 123 - ignoreWarning("QQuickMaterialStyle: unknown accent \"foo\"") + ignoreWarning(Qt.resolvedUrl("tst_material.qml") + ":57:9: QML Button: unknown Material.accent value: foo") control.Material.accent = "foo" - ignoreWarning("QQuickMaterialStyle: unknown accent \"#1\"") + ignoreWarning(Qt.resolvedUrl("tst_material.qml") + ":57:9: QML Button: unknown Material.accent value: #1") control.Material.accent = "#1" control.destroy() diff --git a/tests/auto/universal/data/tst_universal.qml b/tests/auto/universal/data/tst_universal.qml index 6e70f011..b2f164e1 100644 --- a/tests/auto/universal/data/tst_universal.qml +++ b/tests/auto/universal/data/tst_universal.qml @@ -284,11 +284,11 @@ TestCase { compare(control.Universal.accent, "#80808080") // unknown - ignoreWarning("QQuickUniversalStyle: unknown accent 123") + ignoreWarning(Qt.resolvedUrl("tst_universal.qml") + ":57:9: QML Button: unknown Universal.accent value: 123") control.Universal.accent = 123 - ignoreWarning("QQuickUniversalStyle: unknown accent \"foo\"") + ignoreWarning(Qt.resolvedUrl("tst_universal.qml") + ":57:9: QML Button: unknown Universal.accent value: foo") control.Universal.accent = "foo" - ignoreWarning("QQuickUniversalStyle: unknown accent \"#1\"") + ignoreWarning(Qt.resolvedUrl("tst_universal.qml") + ":57:9: QML Button: unknown Universal.accent value: #1") control.Universal.accent = "#1" control.destroy() |