diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index f480a72398f21be6638c7c78e20b7ceef65a3375..7758d40080c790068e71121bbcd57ca624babdb0 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 d8436a55674f366b1950c1e1d25c8d3b9b50975d..618ad01bbb50ea8e0c3a83d641fe7e8b8ab96e51 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 2d4000a2600316dfdebf4042829d2c2d8b9bad84..e33e5bd39272f4685caba93c074af137dc4f1940 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;