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

QmakeProject: Use QMAKE_EXT_H to generate correct ui_h paths

Browse Source 
So that the code model can find the right files for ui files
that haven't been build.

Change-Id: I438a3ab9806c8ff6c47e5e188228a31ffb917bdf
Task-number: QTCREATORBUG-14910
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-08-21 11:35:00 +02:00
parent d0e510f362
commit b56b1b1fa2
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1934,6 +1934,7 @@ 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[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);
@@ -2481,13 +2482,15 @@ Utils::FileName QmakeProFileNode::uiDirectory(const Utils::FileName &buildDir) c
return buildDir; return buildDir;
} }
QString QmakeProFileNode::uiHeaderFile(const Utils::FileName &uiDir, const FileName &formFile) QString QmakeProFileNode::uiHeaderFile(const Utils::FileName &uiDir, const FileName &formFile,
const QString &extension)
{ {
if (uiDir.isEmpty()) if (uiDir.isEmpty())
return QString(); return QString();
Utils::FileName uiHeaderFilePath = uiDir; Utils::FileName uiHeaderFilePath = uiDir;
uiHeaderFilePath.appendPath(QLatin1String("ui_") + formFile.toFileInfo().completeBaseName() + QLatin1String(".h")); uiHeaderFilePath.appendPath(QLatin1String("ui_") + formFile.toFileInfo().completeBaseName()
+ extension);
return QDir::cleanPath(uiHeaderFilePath.toString()); return QDir::cleanPath(uiHeaderFilePath.toString());
} }
@@ -2506,8 +2509,9 @@ 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);
foreach (const FileNode *uiFile, uiFiles) { foreach (const FileNode *uiFile, uiFiles) {
QString headerFile = uiHeaderFile(uiDir, uiFile->path()); QString headerFile = uiHeaderFile(uiDir, uiFile->path(), uiExtensions);
if (!headerFile.isEmpty()) if (!headerFile.isEmpty())
m_uiFiles.insert(uiFile->path().toString(), headerFile); m_uiFiles.insert(uiFile->path().toString(), headerFile);
} }

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

@@ -91,6 +91,7 @@ enum QmakeVariable {
ResourceVar, ResourceVar,
ExactResourceVar, ExactResourceVar,
UiDirVar, UiDirVar,
UiHeaderExtensionVar,
MocDirVar, MocDirVar,
PkgConfigVar, PkgConfigVar,
PrecompiledHeaderVar, PrecompiledHeaderVar,
@@ -338,7 +339,8 @@ public:
QString buildDir(QmakeBuildConfiguration *bc = 0) const; QString buildDir(QmakeBuildConfiguration *bc = 0) const;
Utils::FileName uiDirectory(const Utils::FileName &buildDir) const; Utils::FileName uiDirectory(const Utils::FileName &buildDir) const;
static QString uiHeaderFile(const Utils::FileName &uiDir, const Utils::FileName &formFile); static QString uiHeaderFile(const Utils::FileName &uiDir, const Utils::FileName &formFile,
const QString &extension);
QHash<QString, QString> uiFiles() const; QHash<QString, QString> uiFiles() const;
QmakeProFileNode *findProFileFor(const Utils::FileName &string) const; QmakeProFileNode *findProFileFor(const Utils::FileName &string) const;

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

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