diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 4a0b0f783eb10e5657e569e53282d6876efc49ba..52a483d9521942c80e0988e4cd740eb0a3952182 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 dcbe2851eea1998159ed0160c988e0bbdf3b22dd..3eab98ab2e785c94feb0491dab28ca542c8143be 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