Commit 9240ceaf authored by con's avatar con
Browse files

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
parent 8f0b3f46
......@@ -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();
......
......@@ -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();
......
......@@ -135,6 +135,7 @@ public:
QString demosPath() const;
QString headerInstallPath() const;
QString frameworkInstallPath() const;
// All valid Ids are >= 0
int uniqueId() const;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment