From a71b2840788f0a5240244c246d3ffc81f8474a11 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Fri, 19 Feb 2010 09:37:44 +0100
Subject: [PATCH] Don't assert when qml file is parsed for non-exising import
path
Fixes a crash where the qml file was deregistered already because
of invalid qml.
Task-number: BAUHAUS-394
---
src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp
index 3d1f5acf103..212c8fb1c53 100644
--- a/src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp
@@ -248,8 +248,7 @@ void SubComponentManagerPrivate::parseFile(const QString &filePath)
return;
}
- QString dir = QFileInfo(filePath).dir().path();
- Q_ASSERT(m_dirToQualifier.contains(dir));
+ QFileInfo dir = QFileInfo(filePath).absolutePath();
foreach (const QString &qualifier, m_dirToQualifier.values(dir)) {
registerQmlFile(filePath, qualifier, document);
}
--
GitLab