Commit 2bb26280 authored by Sergey Shambir's avatar Sergey Shambir
Browse files

Qt4Projet: handle OBJECTIVE_HEADERS qmake var



Since there are no separate file extensions for Objective-C and
Objective-C++ headers, all headers can be parsed as Objective-C++.

Change-Id: I91500c53de0fc14ce7be0c7c534e443d1f1f725a
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent e12e797d
......@@ -1920,6 +1920,8 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
QLatin1String("SOURCES"), m_projectDir, buildDirectory);
newVarValues[ObjCSourceVar] = fileListForVar(m_readerExact, m_readerCumulative,
QLatin1String("OBJECTIVE_SOURCES"), m_projectDir, buildDirectory);
newVarValues[ObjCHeaderVar] = fileListForVar(m_readerExact, m_readerCumulative,
QLatin1String("OBJECTIVE_HEADERS"), m_projectDir, buildDirectory);
newVarValues[UiDirVar] = QStringList() << uiDirPath(m_readerExact);
newVarValues[MocDirVar] = QStringList() << mocDirPath(m_readerExact);
newVarValues[PkgConfigVar] = m_readerExact->values(QLatin1String("PKGCONFIG"));
......
......@@ -84,6 +84,7 @@ enum Qt4Variable {
CppHeaderVar,
CppSourceVar,
ObjCSourceVar,
ObjCHeaderVar,
UiDirVar,
MocDirVar,
PkgConfigVar,
......
......@@ -592,6 +592,11 @@ void Qt4Project::updateCppCodeModel()
allFiles << file;
part->files << ProjectFile(file, ProjectFile::ObjCSource);
}
foreach (const QString &file, pro->variableValue(ObjCHeaderVar)) {
allFiles << file;
part->files << ProjectFile(file, ProjectFile::ObjCXXHeader);
}
pinfo.appendProjectPart(part);
}
......
Markdown is supported
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