From b519a1132ab05b91226eea9ee1ccd3628fa1e4b0 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 9 Nov 2009 16:25:40 +0100
Subject: [PATCH] Debugger: Activate code model scope checking, environment var
for Trk verbosity.
Reviewed-by: hjk
---
src/plugins/debugger/debuggeractions.cpp | 4 ++--
src/plugins/debugger/gdb/trkgdbadapter.cpp | 10 +++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 4a0b0f783eb..52a483d9521 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -233,8 +233,8 @@ DebuggerSettings *DebuggerSettings::instance()
item->setSettingsKey(debugModeGroup, QLatin1String("UseCodeModel"));
item->setText(tr("Use code model"));
item->setCheckable(true);
- item->setDefaultValue(false);
- item->setValue(false);
+ item->setDefaultValue(true);
+ item->setValue(true);
instance->insertItem(UseCodeModel, item);
item = new SavedAction(instance);
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index dcbe2851eea..3eab98ab2e7 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -197,9 +197,17 @@ TrkGdbAdapter::TrkGdbAdapter(GdbEngine *engine, const TrkOptionsPtr &options) :
m_running(false),
m_trkDevice(new trk::TrkDevice),
m_gdbAckMode(true),
- m_verbose(2),
+ m_verbose(0),
m_bufferedMemoryRead(true)
{
+ const QByteArray trkVerbose = qgetenv("QTC_TRK_VERBOSE");
+ if (!trkVerbose.isEmpty()) {
+ bool ok;
+ m_verbose = trkVerbose.toInt(&ok);
+ if (!ok)
+ m_verbose = 1;
+ }
+
m_gdbServer = 0;
m_gdbConnection = 0;
#ifdef Q_OS_WIN
--
GitLab