From 6272ba6ced2d6dc5fdd651fce9e958ac7215ccd0 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 20 Aug 2018 14:05:06 +0200 Subject: 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 --- tests/auto/qquickstyle/data/DummyStyle/Button.qml | 2 -- tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml | 2 ++ tests/auto/qquickstyle/tst_qquickstyle.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 tests/auto/qquickstyle/data/DummyStyle/Button.qml create mode 100644 tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml diff --git a/tests/auto/qquickstyle/data/DummyStyle/Button.qml b/tests/auto/qquickstyle/data/DummyStyle/Button.qml deleted file mode 100644 index 5b08222c..00000000 --- a/tests/auto/qquickstyle/data/DummyStyle/Button.qml +++ /dev/null @@ -1,2 +0,0 @@ -import QtQuick.Templates 2.0 as T -T.Button { } diff --git a/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml b/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml new file mode 100644 index 00000000..5b08222c --- /dev/null +++ b/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml @@ -0,0 +1,2 @@ +import QtQuick.Templates 2.0 as T +T.Button { } 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; -- cgit v1.2.3