From 9240ceaf354580e20c962ce52870faecccc2ad5a Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Mon, 18 Oct 2010 17:12:44 +0200
Subject: [PATCH] Add the path to the installed Qt Frameworks on Mac.
Otherwise all the Qt headers might not be found at all.
Task-number: QTCREATORBUG-1377
Reviewed-by: Tobias Hunger
Reviewed-by: Erik Verbruggen
---
src/plugins/qt4projectmanager/qt4project.cpp | 4 ++++
src/plugins/qt4projectmanager/qtversionmanager.cpp | 10 ++++++++++
src/plugins/qt4projectmanager/qtversionmanager.h | 1 +
3 files changed, 15 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index f480a72398f..7758d40080c 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -426,6 +426,10 @@ void Qt4Project::updateCppCodeModel()
QStringList predefinedFrameworkPaths;
QByteArray predefinedMacros;
+ QString qtFrameworkPath = activeBC->qtVersion()->frameworkInstallPath();
+ if (!qtFrameworkPath.isEmpty())
+ predefinedFrameworkPaths.append(qtFrameworkPath);
+
ToolChain *tc = activeBC->toolChain();
if (tc) {
predefinedMacros = tc->predefinedMacros();
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index d8436a55674..618ad01bbb5 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1725,6 +1725,16 @@ QString QtVersion::headerInstallPath() const
return m_versionInfo["QT_INSTALL_HEADERS"];
}
+QString QtVersion::frameworkInstallPath() const
+{
+#ifdef Q_OS_MAC
+ updateVersionInfo();
+ return m_versionInfo["QT_INSTALL_LIBS"];
+#else
+ return QString();
+#endif
+}
+
bool QtVersion::hasExamples() const
{
updateVersionInfo();
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index 2d4000a2600..e33e5bd3927 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -135,6 +135,7 @@ public:
QString demosPath() const;
QString headerInstallPath() const;
+ QString frameworkInstallPath() const;
// All valid Ids are >= 0
int uniqueId() const;
--
GitLab