aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/universal
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-01-14 11:34:22 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-01-14 10:40:09 +0000
commit70a31cdafbdb3f018e10465ccb9a481d6fa54ab5 (patch)
treeaf5ef4c20223bf17a55ca00e18589c34630d9ad7 /tests/auto/universal
parentc08c717225e3c5387dd5f03cf42a7473403142ae (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/auto/universal')
-rw-r--r--tests/auto/universal/data/tst_universal.qml6
1 files changed, 3 insertions, 3 deletions
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()