feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qmake: Retrieve .h and .cpp extension variables with correct names

Browse Source 
We will need them for more things than ui_*.h.

Change-Id: I394aa8646095cdafb426c15746243b27c1c1ab1b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-02-08 17:53:07 +01:00
parent 2d4ea0b623
commit bffaf9cc49
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -1997,7 +1997,8 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
result->newVarValues[ObjCHeaderVar] = fileListForVar(input.readerExact, input.readerCumulative, result->newVarValues[ObjCHeaderVar] = fileListForVar(input.readerExact, input.readerCumulative,
QLatin1String("OBJECTIVE_HEADERS"), input.projectDir, input.buildDirectory); QLatin1String("OBJECTIVE_HEADERS"), input.projectDir, input.buildDirectory);
result->newVarValues[UiDirVar] = QStringList() << uiDirPath(input.readerExact, input.buildDirectory); result->newVarValues[UiDirVar] = QStringList() << uiDirPath(input.readerExact, input.buildDirectory);
result->newVarValues[UiHeaderExtensionVar] = QStringList() << input.readerExact->value(QLatin1String("QMAKE_EXT_H")); result->newVarValues[HeaderExtensionVar] = QStringList() << input.readerExact->value(QLatin1String("QMAKE_EXT_H"));
result->newVarValues[CppExtensionVar] = QStringList() << input.readerExact->value(QLatin1String("QMAKE_EXT_CPP"));
result->newVarValues[MocDirVar] = QStringList() << mocDirPath(input.readerExact, input.buildDirectory); result->newVarValues[MocDirVar] = QStringList() << mocDirPath(input.readerExact, input.buildDirectory);
result->newVarValues[ResourceVar] = fileListForVar(input.readerExact, input.readerCumulative, result->newVarValues[ResourceVar] = fileListForVar(input.readerExact, input.readerCumulative,
QLatin1String("RESOURCES"), input.projectDir, input.buildDirectory); QLatin1String("RESOURCES"), input.projectDir, input.buildDirectory);
@@ -2578,7 +2579,7 @@ void QmakeProFileNode::updateUiFiles(const QString &buildDir)
// Find the UiDir, there can only ever be one // Find the UiDir, there can only ever be one
const Utils::FileName uiDir = uiDirectory(Utils::FileName::fromString(buildDir)); const Utils::FileName uiDir = uiDirectory(Utils::FileName::fromString(buildDir));
const QString uiExtensions = singleVariableValue(UiHeaderExtensionVar); const QString uiExtensions = singleVariableValue(HeaderExtensionVar);
foreach (const FileNode *uiFile, uiFiles) { foreach (const FileNode *uiFile, uiFiles) {
QString headerFile = uiHeaderFile(uiDir, uiFile->filePath(), uiExtensions); QString headerFile = uiHeaderFile(uiDir, uiFile->filePath(), uiExtensions);
if (!headerFile.isEmpty()) if (!headerFile.isEmpty())

3
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -86,7 +86,8 @@ enum QmakeVariable {
ResourceVar, ResourceVar,
ExactResourceVar, ExactResourceVar,
UiDirVar, UiDirVar,
UiHeaderExtensionVar, HeaderExtensionVar,
CppExtensionVar,
MocDirVar, MocDirVar,
PkgConfigVar, PkgConfigVar,
PrecompiledHeaderVar, PrecompiledHeaderVar,

2
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -870,7 +870,7 @@ QString QmakeProject::generatedUiHeader(const FileName &formFile) const
if (const QmakeProFileNode *pro = proFileNodeOf(rootProjectNode(), FormType, formFile)) if (const QmakeProFileNode *pro = proFileNodeOf(rootProjectNode(), FormType, formFile))
return QmakeProFileNode::uiHeaderFile( return QmakeProFileNode::uiHeaderFile(
pro->uiDirectory(Utils::FileName::fromString(pro->buildDir())), pro->uiDirectory(Utils::FileName::fromString(pro->buildDir())),
formFile, pro->singleVariableValue(QmakeVariable::UiHeaderExtensionVar)); formFile, pro->singleVariableValue(QmakeVariable::HeaderExtensionVar));
return QString(); return QString();
} }