diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-12 11:08:25 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-12 12:17:37 +0000 |
commit | 3e3a4062ae8051d862b39420e0955ac5e9fbe7a2 (patch) | |
tree | 3e5b687ada24ce084097e29fad8ef377b3fe243d /tests/auto | |
parent | c6e94e46077baf07793f95213bb53a8e56cf9b44 (diff) |
Tests: fix QQuickVisualTestUtil::addTestRowForEachControl()
Since fe7d1b89, the Default style is unconditionally available in
resources. This made tst_objectcount fail, because it was calling
QUrl::fromLocalFile() for a file path in resources.
Change-Id: I99ccdea7f7bad65620fcf41c0554e7fdd8677611
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/shared/visualtestutil.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/shared/visualtestutil.cpp b/tests/auto/shared/visualtestutil.cpp index 44ca6d77..3eaaa588 100644 --- a/tests/auto/shared/visualtestutil.cpp +++ b/tests/auto/shared/visualtestutil.cpp @@ -116,13 +116,16 @@ void QQuickVisualTestUtil::addTestRowForEachControl(QQmlEngine *engine, const QS for (const QString &importPath : importPathList) { QString name = entry.dir().dirName() + "/" + entry.fileName(); QString filePath = importPath + "/" + targetPath + "/" + entry.fileName(); + if (filePath.startsWith(":")) + filePath.prepend("qrc"); if (QFile::exists(filePath)) { QTest::newRow(qPrintable(name)) << QUrl::fromLocalFile(filePath); break; } else { + QUrl url(filePath); filePath = QQmlFile::urlToLocalFileOrQrc(filePath); if (!filePath.isEmpty() && QFile::exists(filePath)) { - QTest::newRow(qPrintable(name)) << QUrl(filePath); + QTest::newRow(qPrintable(name)) << url; break; } } |