From 702e9f3fb96932a676ce5bb068a51170903003b0 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 4 Nov 2010 18:19:33 +0100
Subject: [PATCH] debugger: cosmetics
---
src/plugins/debugger/debuggerconstants.h | 6 ------
src/plugins/debugger/gdb/gdbengine.cpp | 7 ++++++-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index eae97dd2625..040911aac1a 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -79,12 +79,6 @@ const char * const DOCKWIDGET_QML_SCRIPTCONSOLE = "Debugger.Docks.ScriptConsole"
namespace Internal {
enum { debug = 0 };
-#ifdef Q_OS_MAC
- const char * const LD_PRELOAD_ENV_VAR = "DYLD_INSERT_LIBRARIES";
-#else
- const char * const LD_PRELOAD_ENV_VAR = "LD_PRELOAD";
-#endif
-
} // namespace Internal
const char * const OPENED_BY_DEBUGGER = "OpenedByDebugger";
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index b122edfce4a..af97def426e 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1548,8 +1548,13 @@ void GdbEngine::pythonDumpersFailed()
if (m_gdbAdapter->dumperHandling()
== AbstractGdbAdapter::DumperLoadedByGdbPreload
&& checkDebuggingHelpersClassic()) {
+#ifdef Q_OS_MAC
+ const char * const LD_PRELOAD_ENV_VAR = "DYLD_INSERT_LIBRARIES";
+#else
+ const char * const LD_PRELOAD_ENV_VAR = "LD_PRELOAD";
+#endif
QByteArray cmd = "set environment ";
- cmd += Debugger::Constants::Internal::LD_PRELOAD_ENV_VAR;
+ cmd += LD_PRELOAD_ENV_VAR;
cmd += ' ';
cmd += startParameters().startMode == StartRemoteGdb
? startParameters().remoteDumperLib
--
GitLab