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

QmlObserver: showing a warning when changes cannot be synchronized

Browse Source 
Reviewed by:  Thomas Hartmann
This commit is contained in:
Christiaan Janssen
2010-09-22 16:28:13 +02:00
parent 02283ea84d
commit 0bc0a2df5a
3 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/qmljs/qmljsdelta.cpp
View File

@@ -390,6 +390,9 @@ void Delta::update(UiObjectMember* oldObject, const QmlJS::Document::Ptr& oldDoc
const QString scriptCode = _scriptCode(script, newDoc);
UiScriptBinding *previousScript = cast<UiScriptBinding *>(oldMember);
if (!previousScript || _scriptCode(previousScript, oldDoc) != scriptCode) {
if (debugReferences.count()==0) {
notifyUnsyncronizableElementChange(newObject);
}
foreach (DebugId ref, debugReferences) {
if (ref != -1)
updateScriptBinding(ref, newObject, script, property, scriptCode);
@@ -401,6 +404,9 @@ void Delta::update(UiObjectMember* oldObject, const QmlJS::Document::Ptr& oldDoc
UiSourceElement *previousSource = cast<UiSourceElement*>(oldMember);
if (!previousSource || _methodCode(previousSource, oldDoc) != methodCode) {
if (debugReferences.count()==0) {
notifyUnsyncronizableElementChange(newObject);
}
foreach (DebugId ref, debugReferences) {
if (ref != -1)
updateMethodBody(ref, newObject, script, methodName, methodCode);
@@ -476,10 +482,13 @@ Delta::DebugIdMap Delta::operator()(const Document::Ptr &doc1, const Document::P
UiObjectMember *x = M.way2[y];
Q_ASSERT(cast<UiObjectDefinition *>(x) || cast<UiObjectBinding *>(x) );
if (debugIds.contains(x)) {
QList<DebugId> ids = debugIds[x];
newDebuggIds[y] = ids;
update(x, doc1, y, doc2, ids);
{
QList<DebugId> updateIds;
if (debugIds.contains(x)) {
updateIds = debugIds[x];
newDebuggIds[y] = updateIds;
}
update(x, doc1, y, doc2, updateIds);
}
//qDebug() << "Delta::operator(): match "<< label(x, doc1) << "with parent " << label(parents1.parent.value(x), doc1)
// << " to "<< label(y, doc2) << "with parent " << label(parents2.parent.value(y), doc2);
@@ -533,5 +542,8 @@ void Delta::updateMethodBody(DebugId, UiObjectMember *, UiScriptBinding *, const
void Delta::updateScriptBinding(DebugId, UiObjectMember *, UiScriptBinding *, const QString &, const QString &)
{}
void Delta::notifyUnsyncronizableElementChange(UiObjectMember *)
{}
} //namespace QmlJs