From ffca9bb5cc7226a0dc84cbad6e96bd5255eeecfb Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 12 Nov 2009 16:49:12 +0100
Subject: [PATCH] Debugger: Do not use LD_PRELOAD on Mac.
Fails for system Qt on 10.6.
Reviewed-By: hjk <qtc-committer@nokia.com>
---
src/plugins/debugger/gdb/plaingdbadapter.cpp | 3 ++-
src/plugins/debugger/gdb/termgdbadapter.cpp | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp
index fbcf96c8605..c0e0908666d 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp
@@ -60,7 +60,8 @@ PlainGdbAdapter::PlainGdbAdapter(GdbEngine *engine, QObject *parent)
AbstractGdbAdapter::DumperHandling PlainGdbAdapter::dumperHandling() const
{
-#ifdef Q_OS_WIN
+ // LD_PRELOAD fails for System-Qt on Mac.
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
return DumperLoadedByGdb;
#else
return DumperLoadedByGdbPreload;
diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp
index 5461d175bf2..613aaa79f30 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/termgdbadapter.cpp
@@ -71,7 +71,8 @@ TermGdbAdapter::~TermGdbAdapter()
AbstractGdbAdapter::DumperHandling TermGdbAdapter::dumperHandling() const
{
-#ifdef Q_OS_WIN
+ // LD_PRELOAD fails for System-Qt on Mac.
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
return DumperLoadedByGdb;
#else
return DumperLoadedByAdapter; // Handles loading itself via LD_PRELOAD
--
GitLab