From 95cdea6af1a49ed4feef4fdfbbb0db37326e7cbb Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Thu, 23 Feb 2012 17:40:48 +0100
Subject: [PATCH] Mac build fix
Change-Id: I5b39a1753ed8b64a6e2f3a71ffb6dc9dd0546971
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/projectexplorer/runconfiguration.cpp | 2 +-
src/plugins/projectexplorer/runconfiguration.h | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 971892bbf4e..7044d8099ae 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -53,7 +53,7 @@
#include <QPushButton>
#ifdef Q_OS_MAC
-#include <Carbon/Carbon.h>
+#include <ApplicationServices/ApplicationServices.h>
#endif
using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 8d53c1fa3f2..708af8e85bd 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -46,7 +46,6 @@
QT_FORWARD_DECLARE_CLASS(QIcon)
namespace Utils { class OutputFormatter; }
-namespace Debugger { namespace Internal { class DebuggerRunConfigWidget; } }
namespace ProjectExplorer {
class Abi;
@@ -120,9 +119,7 @@ public:
signals:
void debuggersChanged();
-private:
- friend class RunConfiguration;
- friend class Debugger::Internal::DebuggerRunConfigWidget;
+public:
RunConfiguration *m_runConfiguration;
bool m_useCppDebugger;
QmlDebuggerStatus m_useQmlDebugger;
--
GitLab