From 9e59bdf9aeb9de3322508c2271e8d56f00353ed7 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 18 Aug 2010 10:21:05 +0200
Subject: [PATCH] debugger: fix merge
---
share/qtcreator/gdbmacros/dumper.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index 9b864a4f0cb..c4151d93ed9 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",
--
GitLab