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
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
This commit is contained in:
hjk
2010-08-13 11:19:44 +02:00
parent b50619066a b44efd097b
commit 64e4a8f7ae
15 changed files with 22659 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/gdbmacros/gdbmacros.py
View File

@@ -501,9 +501,9 @@ def qdump__QLocale(d, item):
d.putCallItem("measurementSystem", item, "measurementSystem()")
d.putCallItem("numberOptions", item, "numberOptions()")
d.putCallItem("timeFormat_(short)", item,
"timeFormat(" + d.ns + "QLocale::ShortFormat)")
"timeFormat('" + d.ns + "QLocale::ShortFormat')")
d.putCallItem("timeFormat_(long)", item,
"timeFormat(" + d.ns + "QLocale::LongFormat)")
"timeFormat('" + d.ns + "QLocale::LongFormat')")
d.putCallItem("decimalPoint", item, "decimalPoint()")
d.putCallItem("exponential", item, "exponential()")
d.putCallItem("percent", item, "percent()")