From 8e522c92eec0f83a19c0d3cbd1d77ab8a1a4f4d4 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 8 Mar 2010 13:14:23 +0100
Subject: [PATCH] debugger: really don't use curses on windows
---
share/qtcreator/gdbmacros/dumper.py | 9 ++++++++-
share/qtcreator/gdbmacros/gdbmacros.py | 3 +--
tests/manual/gdbdebugger/simple/app.cpp | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index 3db8be0a5d5..3cc9d26b9fc 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -10,8 +10,15 @@ import base64
import os
import __builtin__
-if os.name != "nt":
+if os.name == "nt":
+ def printableChar(ucs):
+ if ucs >= 32 and ucs <= 126:
+ return ucs
+ return '?'
+else:
import curses.ascii
+ def printableChar(ucs):
+ return select(curses.ascii.isprint(ucs), ucs, '?')
# only needed for gdb 7.0/7.0.1 that do not implement parse_and_eval
import os
diff --git a/share/qtcreator/gdbmacros/gdbmacros.py b/share/qtcreator/gdbmacros/gdbmacros.py
index 93e4a4ad633..35e94a0946a 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.py
+++ b/share/qtcreator/gdbmacros/gdbmacros.py
@@ -37,8 +37,7 @@ def qdump__QByteArray(d, item):
def qdump__QChar(d, item):
ucs = int(item.value["ucs"])
- c = select(curses.ascii.isprint(ucs), ucs, '?')
- d.putValue("'%c' (%d)" % (c, ucs))
+ d.putValue("'%c' (%d)" % (printableChar(ucs), ucs))
d.putNumChild(0)
diff --git a/tests/manual/gdbdebugger/simple/app.cpp b/tests/manual/gdbdebugger/simple/app.cpp
index a70459d11a7..316ed1ce78a 100644
--- a/tests/manual/gdbdebugger/simple/app.cpp
+++ b/tests/manual/gdbdebugger/simple/app.cpp
@@ -428,7 +428,7 @@ void testQList()
flist.push_back(1000);
flist.push_back(1001);
flist.push_back(1002);
-#if 0
+#if 1
QList<int> li;
QList<uint> lu;
--
GitLab