aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml (renamed from tests/auto/qquickstyle/data/DummyStyle/Button.qml)0
-rw-r--r--tests/auto/qquickstyle/tst_qquickstyle.cpp6
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qquickstyle/data/DummyStyle/Button.qml b/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml
index 5b08222c..5b08222c 100644
--- a/tests/auto/qquickstyle/data/DummyStyle/Button.qml
+++ b/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml
diff --git a/tests/auto/qquickstyle/tst_qquickstyle.cpp b/tests/auto/qquickstyle/tst_qquickstyle.cpp
index c4cc4d27..8d09a293 100644
--- a/tests/auto/qquickstyle/tst_qquickstyle.cpp
+++ b/tests/auto/qquickstyle/tst_qquickstyle.cpp
@@ -252,7 +252,7 @@ void tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar_data()
QDebug stream(&environmentVariable);
stream.noquote().nospace() << ":/qrcStyles3" << listSeparator
<< ":/qrcStyles4" << listSeparator
- << QFINDTESTDATA("data");
+ << QFINDTESTDATA("data/dummyStyles");
QStringList expectedAvailableStyles = defaultAvailableStyles;
expectedAvailableStyles.insert(1, QLatin1String("DummyStyle"));
@@ -266,7 +266,7 @@ void tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar_data()
{
QString environmentVariable;
QDebug stream(&environmentVariable);
- stream.noquote().nospace() << QFINDTESTDATA("data") << listSeparator
+ stream.noquote().nospace() << QFINDTESTDATA("data/dummyStyles") << listSeparator
<< ":/qrcStyles3" << listSeparator
<< ":/qrcStyles4";
@@ -284,7 +284,7 @@ void tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar_data()
QDebug stream(&environmentVariable);
// Same as the last row, except it adds a superfluous separator
// to ensure that it handles it gracefully rather than failing an assertion.
- stream.noquote().nospace() << QFINDTESTDATA("data") << listSeparator
+ stream.noquote().nospace() << QFINDTESTDATA("data/dummyStyles") << listSeparator
<< ":/qrcStyles3" << listSeparator
<< ":/qrcStyles4" << listSeparator;