diff options
| -rw-r--r-- | src/quicktestutils/qml/qmlutils.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlqt/BLACKLIST | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/quicktestutils/qml/qmlutils.cpp b/src/quicktestutils/qml/qmlutils.cpp index 0a644f727a..5ca9fce281 100644 --- a/src/quicktestutils/qml/qmlutils.cpp +++ b/src/quicktestutils/qml/qmlutils.cpp @@ -46,7 +46,7 @@ QQmlDataTest::QQmlDataTest(const char *qmlTestDataDir) : #endif m_dataDirectoryUrl(m_dataDirectory.startsWith(QLatin1Char(':')) - ? QUrl(QLatin1String("qrc") + m_dataDirectory) + ? QUrl(QLatin1String("qrc") + m_dataDirectory + QLatin1Char('/')) : QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/'))) { m_instance = this; diff --git a/tests/auto/qml/qqmlqt/BLACKLIST b/tests/auto/qml/qqmlqt/BLACKLIST index e3882be0e9..576c468806 100644 --- a/tests/auto/qml/qqmlqt/BLACKLIST +++ b/tests/auto/qml/qqmlqt/BLACKLIST @@ -1,5 +1,3 @@ # QTBUG-100014 -[resolvedUrl] -android [timeRoundtrip] android |