From 70a31cdafbdb3f018e10465ccb9a481d6fa54ab5 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 14 Jan 2016 11:34:22 +0100 Subject: 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 --- tests/auto/universal/data/tst_universal.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/universal') 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() -- cgit v1.2.3