feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: avoid reset if C++ types did not really change

Browse Source 
Change-Id: I00b59a6b140eb33e2f3206f11e6ab0f9b470dff0
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-07-14 18:39:18 +02:00
parent 1541fbd2ba
commit cd92b70f65
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
View File

@@ -1250,8 +1250,20 @@ void ModelManagerInterface::updateCppQmlTypes(QFutureInterface<void> &interface,
hasNewInfo = hasNewInfo || newData.remove(fileName) > 0; hasNewInfo = hasNewInfo || newData.remove(fileName) > 0;
} else { } else {
CppData &data = newData[fileName]; CppData &data = newData[fileName];
// currently we have no simple way to compare, so we assume the worse if (!hasNewInfo && (data.exportedTypes.size() != exported.size()
hasNewInfo = true; || data.contextProperties != contextProperties))
hasNewInfo = true;
if (!hasNewInfo) {
QHash<QString, QByteArray> newFingerprints;
foreach (LanguageUtils::FakeMetaObject::ConstPtr newType, exported)
newFingerprints[newType->className()]=newType->fingerprint();
foreach (LanguageUtils::FakeMetaObject::ConstPtr oldType, data.exportedTypes) {
if (newFingerprints.value(oldType->className()) != oldType->fingerprint()) {
hasNewInfo = true;
break;
}
}
}
data.exportedTypes = exported; data.exportedTypes = exported;
data.contextProperties = contextProperties; data.contextProperties = contextProperties;
} }