diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-10-12 15:49:51 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-10-12 16:12:15 +0200 |
| commit | 03d1d470e85ee19cb38d47e9aae9588e68622781 (patch) | |
| tree | b4da2fe769ffe545270d3ae9f77015d8c3c77835 | |
| parent | cd1254c22f15f2f26ec893776a759b1a1c1eac0b (diff) | |
Be consistent with data tags in tst_styleimports
Change-Id: I3042ad7543eefa3153db0e9eee1ae9186f7011d1
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| -rw-r--r-- | tests/auto/styleimports/tst_styleimports.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/styleimports/tst_styleimports.cpp b/tests/auto/styleimports/tst_styleimports.cpp index 2db25fc8..56275d9e 100644 --- a/tests/auto/styleimports/tst_styleimports.cpp +++ b/tests/auto/styleimports/tst_styleimports.cpp @@ -109,11 +109,11 @@ void tst_StyleImports::select_data() QTest::newRow("control=ScrollView,style=data,fallback=mat") << "ScrollView.qml" << "data" << "Material" << "Basic"; // Label.qml exists in the "data", Basic and Material styles. - QTest::newRow("control=Label,style=basic,fallback=none") << "Label.qml" << "Basic" << "" << "Basic"; - QTest::newRow("control=Label,style=fs,fallback=none") << "Label.qml" << "FileSystemStyle" << "" << "Basic"; - QTest::newRow("control=Label,style=qrc,fallback=none") << "Label.qml" << "ResourceStyle" << "" << "Basic"; - QTest::newRow("control=Label,style=nosuch,fallback=none") << "Label.qml" << "NoSuchStyle" << "" << "Basic"; - QTest::newRow("control=Label,style=data,fallback=none") << "Label.qml" << "data" << "" << "data"; + QTest::newRow("control=Label,style=basic,fallback=empty") << "Label.qml" << "Basic" << "" << "Basic"; + QTest::newRow("control=Label,style=fs,fallback=empty") << "Label.qml" << "FileSystemStyle" << "" << "Basic"; + QTest::newRow("control=Label,style=qrc,fallback=empty") << "Label.qml" << "ResourceStyle" << "" << "Basic"; + QTest::newRow("control=Label,style=nosuch,fallback=empty") << "Label.qml" << "NoSuchStyle" << "" << "Basic"; + QTest::newRow("control=Label,style=data,fallback=empty") << "Label.qml" << "data" << "" << "data"; QTest::newRow("control=Label,style=basic,fallback=mat") << "Label.qml" << "Basic" << "Material" << "Basic"; QTest::newRow("control=Label,style=fs,fallback=mat") << "Label.qml" << "FileSystemStyle" << "Material" << "Basic"; @@ -122,11 +122,11 @@ void tst_StyleImports::select_data() QTest::newRow("control=Label,style=data,fallback=mat") << "Label.qml" << "data" << "Material" << "data"; // Button.qml exists in all styles including the fs and qrc styles - QTest::newRow("control=Button,style=basic,fallback=none") << "Button.qml" << "Basic" << "" << "Basic"; - QTest::newRow("control=Button,style=fs,fallback=none") << "Button.qml" << "FileSystemStyle" << "" << "FileSystemStyle"; - QTest::newRow("control=Button,style=qrc,fallback=none") << "Button.qml" << "ResourceStyle" << "" << "ResourceStyle"; - QTest::newRow("control=Button,style=nosuch,fallback=none") << "Button.qml" << "NoSuchStyle" << "" << "Basic"; - QTest::newRow("control=Button,style=data,fallback=none") << "Button.qml" << "data" << "" << "data"; + QTest::newRow("control=Button,style=basic,fallback=empty") << "Button.qml" << "Basic" << "" << "Basic"; + QTest::newRow("control=Button,style=fs,fallback=empty") << "Button.qml" << "FileSystemStyle" << "" << "FileSystemStyle"; + QTest::newRow("control=Button,style=qrc,fallback=empty") << "Button.qml" << "ResourceStyle" << "" << "ResourceStyle"; + QTest::newRow("control=Button,style=nosuch,fallback=empty") << "Button.qml" << "NoSuchStyle" << "" << "Basic"; + QTest::newRow("control=Button,style=data,fallback=empty") << "Button.qml" << "data" << "" << "data"; QTest::newRow("control=Button,style=basic,fallback=mat") << "Button.qml" << "Basic" << "Material" << "Basic"; QTest::newRow("control=Button,style=fs,fallback=mat") << "Button.qml" << "FileSystemStyle" << "Material" << "FileSystemStyle"; |