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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/ssh/sshconnection.cpp

Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
This commit is contained in:
Eike Ziller
2012-10-11 21:11:40 +02:00
parent c7f1aeac11 236bd842b5
commit 720cb9f35e
75 changed files with 860 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -1014,9 +1014,8 @@ void QmlEngine::updateWatchData(const WatchData &data,
synchronizeWatchers();
}
if (!data.isSomethingNeeded())
watchHandler()->insertIncompleteData(data);
watchHandler()->insertData(data);
}
void QmlEngine::synchronizeWatchers()