Commit c71edd77 authored by dt's avatar dt
Browse files

Fixes: Finding the ui*.h files so that we can parse those.

parent dd9ccc51
...@@ -540,7 +540,7 @@ Qt4ProFileNode::~Qt4ProFileNode() ...@@ -540,7 +540,7 @@ Qt4ProFileNode::~Qt4ProFileNode()
void Qt4ProFileNode::buildStateChanged(ProjectExplorer::Project *project) void Qt4ProFileNode::buildStateChanged(ProjectExplorer::Project *project)
{ {
if (project == m_project && !ProjectExplorer::ProjectExplorerPlugin::instance()->buildManager()->isBuilding(m_project)) if (project == m_project && !ProjectExplorer::ProjectExplorerPlugin::instance()->buildManager()->isBuilding(m_project))
updateUiFiles(); updateUiFiles(m_project->buildDirectory(m_project->activeBuildConfiguration()));
} }
bool Qt4ProFileNode::hasTargets() const bool Qt4ProFileNode::hasTargets() const
...@@ -710,7 +710,7 @@ void Qt4ProFileNode::update() ...@@ -710,7 +710,7 @@ void Qt4ProFileNode::update()
emit qt4Watcher->variablesChanged(this, m_varValues, newVarValues); emit qt4Watcher->variablesChanged(this, m_varValues, newVarValues);
} }
updateUiFiles(); updateUiFiles(m_project->buildDirectory(m_project->activeBuildConfiguration()));
foreach (NodesWatcher *watcher, watchers()) foreach (NodesWatcher *watcher, watchers())
if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher)) if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
...@@ -744,7 +744,7 @@ namespace { ...@@ -744,7 +744,7 @@ namespace {
// It does so by storing a modification time for each ui file we know about. // It does so by storing a modification time for each ui file we know about.
// TODO this function should also be called if the build directory is changed // TODO this function should also be called if the build directory is changed
void Qt4ProFileNode::updateUiFiles() void Qt4ProFileNode::updateUiFiles(const QString &buildDirectory)
{ {
// Only those two project types can have ui files for us // Only those two project types can have ui files for us
if (m_projectType != ApplicationTemplate if (m_projectType != ApplicationTemplate
...@@ -757,7 +757,7 @@ void Qt4ProFileNode::updateUiFiles() ...@@ -757,7 +757,7 @@ void Qt4ProFileNode::updateUiFiles()
const QList<FileNode*> uiFiles = uiFilesVisitor.uiFileNodes; const QList<FileNode*> uiFiles = uiFilesVisitor.uiFileNodes;
// Find the UiDir, there can only ever be one // Find the UiDir, there can only ever be one
QString uiDir; // We should default to the build directory QString uiDir = buildDirectory;
QStringList tmp = m_varValues[UiDirVar]; QStringList tmp = m_varValues[UiDirVar];
if (tmp.size() != 0) if (tmp.size() != 0)
uiDir = tmp.first(); uiDir = tmp.first();
......
...@@ -187,7 +187,7 @@ public slots: ...@@ -187,7 +187,7 @@ public slots:
void scheduleUpdate(); void scheduleUpdate();
void update(); void update();
private slots: private slots:
void updateUiFiles(); void updateUiFiles(const QString& buildConfiguration);
void buildStateChanged(ProjectExplorer::Project*); void buildStateChanged(ProjectExplorer::Project*);
private: private:
......
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