From 8762dd2ea94e4a2f371b9f1667d8b14352264e6b Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@digia.com>
Date: Tue, 21 May 2013 15:42:02 +0200
Subject: [PATCH] qmljstools: reset code model after update of exported cpp
types
Task-number: QTCREATORBUG-9105
Change-Id: Id0021902985da8e5e7faec23766bb37541d041c0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
src/plugins/qmljstools/qmljsmodelmanager.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index 5893c972d71..07e9ec06c12 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -925,6 +925,7 @@ void ModelManager::updateCppQmlTypes(QFutureInterface<void> &interface,
FindExportedCppTypes finder(snapshot);
+ bool hasNewInfo = false;
typedef QPair<CPlusPlus::Document::Ptr, bool> DocScanPair;
foreach (const DocScanPair &pair, documents) {
if (interface.isCanceled())
@@ -934,7 +935,7 @@ void ModelManager::updateCppQmlTypes(QFutureInterface<void> &interface,
const bool scan = pair.second;
const QString fileName = doc->fileName();
if (!scan) {
- newData.remove(fileName);
+ hasNewInfo = hasNewInfo || newData.remove(fileName) > 0;
continue;
}
@@ -943,9 +944,11 @@ void ModelManager::updateCppQmlTypes(QFutureInterface<void> &interface,
QList<LanguageUtils::FakeMetaObject::ConstPtr> exported = finder.exportedTypes();
QHash<QString, QString> contextProperties = finder.contextProperties();
if (exported.isEmpty() && contextProperties.isEmpty()) {
- newData.remove(fileName);
+ hasNewInfo = hasNewInfo || newData.remove(fileName) > 0;
} else {
CppData &data = newData[fileName];
+ // currently we have no simple way to compare, so we assume the worse
+ hasNewInfo = true;
data.exportedTypes = exported;
data.contextProperties = contextProperties;
}
@@ -955,6 +958,9 @@ void ModelManager::updateCppQmlTypes(QFutureInterface<void> &interface,
QMutexLocker locker(&qmlModelManager->m_cppDataMutex);
qmlModelManager->m_cppDataHash = newData;
+ if (hasNewInfo)
+ // one could get away with re-linking the cpp types...
+ QMetaObject::invokeMethod(qmlModelManager, "resetCodeModel");
}
ModelManager::CppDataHash ModelManager::cppData() const
--
GitLab