summaryrefslogtreecommitdiff
path: root/src/plugins/qmljseditor/qmljsmodelmanager.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2010-09-08 10:11:44 +0200
committerRoberto Raggi <roberto.raggi@nokia.com>2010-09-08 11:39:24 +0200
commite33767205bd2663b90d1fedbba43bef6fbcf9835 (patch)
tree6b98d487e7c7040d0fafcb1cc52d1961b88096ff /src/plugins/qmljseditor/qmljsmodelmanager.cpp
parentcf40fdcccfd86c33ebf8e672b5563d3aee3ddbb5 (diff)
downloadqt-creator-e33767205bd2663b90d1fedbba43bef6fbcf9835.tar.gz
Introduced SemanticInfo::isValid().
Diffstat (limited to 'src/plugins/qmljseditor/qmljsmodelmanager.cpp')
-rw-r--r--src/plugins/qmljseditor/qmljsmodelmanager.cpp7
1 files changed, 6 insertions, 1 deletions
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,