1 files changed, 6 insertions, 12 deletions
diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp
index bf6a3d11..ac5bcfba 100644
--- a/tests/auto/sanity/tst_sanity.cpp
+++ b/tests/auto/sanity/tst_sanity.cpp
@@ -135,20 +135,14 @@ private:
     QStringList m_errors;
 };
 
-static QMap<QString, QString> listQmlFiles(const QDir &dir)
-{
-    QMap<QString, QString> files;
-    foreach (const QFileInfo &entry, dir.entryInfoList(QStringList() << "*.qml" << "*.js", QDir::Files))
-        files.insert(entry.baseName(), entry.absoluteFilePath());
-    return files;
-}
-
 void tst_Sanity::initTestCase()
 {
-    QQmlEngine engine;
-    foreach (const QString &path, engine.importPathList()) {
-        files.unite(listQmlFiles(QDir(path + "/Qt/labs/calendar")));
-        files.unite(listQmlFiles(QDir(path + "/Qt/labs/controls")));
+    QDirIterator it(QQC2_IMPORT_PATH, QStringList() << "*.qml" << "*.js", QDir::Files, QDirIterator::Subdirectories);
+    while (it.hasNext()) {
+        it.next();
+        QFileInfo info = it.fileInfo();
+        if (info.dir().dirName() != QStringLiteral("snippets") && info.dir().dirName() != QStringLiteral("designer"))
+            files.insert(info.baseName(), info.filePath());
     }
 }