summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2010-08-18 10:21:05 +0200
committerhjk <qtc-committer@nokia.com>2010-08-18 10:21:05 +0200
commit9e59bdf9aeb9de3322508c2271e8d56f00353ed7 (patch)
tree41b0a2292e55e85c9e7b6e8b7cdfd9b2012421df
parent1fba1858825ae60644c5bc5d75b6cc9fd5550c2b (diff)
downloadqt-creator-9e59bdf9aeb9de3322508c2271e8d56f00353ed7.tar.gz
debugger: fix merge
-rw-r--r--share/qtcreator/gdbmacros/dumper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index 9b864a4f0c..c4151d93ed 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -618,7 +618,7 @@ movableTypes = set([
"QFileInfo", "QFixed", "QFixedPoint", "QFixedSize",
"QHashDummyValue",
"QIcon", "QImage",
- "QLine", "QLineF", "QLatin1Char", "QLocal",
+ "QLine", "QLineF", "QLatin1Char", "QLocale",
"QMatrix", "QModelIndex",
"QPoint", "QPointF", "QPen", "QPersistentModelIndex",
"QResourceRoot", "QRect", "QRectF", "QRegExp",