From e33767205bd2663b90d1fedbba43bef6fbcf9835 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 8 Sep 2010 10:11:44 +0200
Subject: Introduced SemanticInfo::isValid().

---
 src/plugins/qmljseditor/qmljsmodelmanager.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/plugins/qmljseditor/qmljsmodelmanager.cpp')

diff --git a/src/plugins/qmljseditor/qmljsmodelmanager.cpp b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
index 6bbe8a0b7f..b6b3ffeb9d 100644
--- a/src/plugins/qmljseditor/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
@@ -80,7 +80,12 @@ ModelManager::ModelManager(QObject *parent):
 
 void ModelManager::loadQmlTypeDescriptions()
 {
-    const QString resourcePath = Core::ICore::instance()->resourcePath();
+    loadQmlTypeDescriptions(Core::ICore::instance()->resourcePath());
+    loadQmlTypeDescriptions(Core::ICore::instance()->userResourcePath());
+}
+
+void ModelManager::loadQmlTypeDescriptions(const QString &resourcePath)
+{
     const QDir typeFileDir(resourcePath + QLatin1String("/qml-type-descriptions"));
     const QStringList xmlExtensions = QStringList() << QLatin1String("*.xml");
     const QFileInfoList xmlFiles = typeFileDir.entryInfoList(xmlExtensions,
-- 
cgit v1.2.1