From 8df9aaf5c7cd02801d892fcd03089e0fb69d7759 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Thu, 2 Apr 2009 15:40:47 +0200
Subject: [PATCH] Qt Creator didn't always find the ui files for SUBDIRS
projects
In case no UIDIR was set, we always searched in the toplevel
buildDirectory instead of the buildDirectory conresponding to the actual
pro file.
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index b85efa2821a..8dc7d2bfb09 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -754,7 +754,7 @@ void Qt4ProFileNode::updateUiFiles(const QString &buildDirectory)
const QList<FileNode*> uiFiles = uiFilesVisitor.uiFileNodes;
// Find the UiDir, there can only ever be one
- QString uiDir = buildDirectory;
+ QString uiDir = buildDir();
QStringList tmp = m_varValues[UiDirVar];
if (tmp.size() != 0)
uiDir = tmp.first();
--
GitLab