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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/fakevim/fakevimhandler.cpp
This commit is contained in:
con
2010-07-06 15:34:50 +02:00
parent 7feed7318b 15047f8816
commit 1a2a4f6387
50 changed files with 1838 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/gdbmacros/dumper.py
View File

@@ -1164,7 +1164,7 @@ class Dumper:
self.put('{name="<incomplete>",value="",type="",numchild="0"},')
def putType(self, type, priority = 0):
# higher priority values override lower ones
# Higher priority values override lower ones.
if priority >= self.currentTypePriority:
self.currentType = type
self.currentTypePriority = priority