diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-08-20 14:05:06 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-08-20 12:12:06 +0000 |
| commit | 6272ba6ced2d6dc5fdd651fce9e958ac7215ccd0 (patch) | |
| tree | 458fad2b213004d4ecb5c11b478535ff0da19145 | |
| parent | 59790228e2b19f0af9a3cb279b41ecb122578a00 (diff) | |
Fix tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar() failure
Move DummyStyle into a subdirectory of the "data" directory, because
otherwise availableStyles() picks it up and makes us fail.
Task-number: QTBUG-70065
Change-Id: Ib69075832b5bcf30c6b960e6a4bcda69f016baf2
Reviewed-by: Liang Qi <liang.qi@qt.io>
| -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.cpp | 6 |
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; |