summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-05-03 12:42:05 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-07-04 12:34:54 +0200
commit2766aaad4b6204c08f2a3d8144da3b7b2daa16a0 (patch)
treec881aeb88004287cda765fcbd88bd8659f9e85df /src/plugins/qt4projectmanager
parent87fbe16fd570568e9b95089f71772aa004956b93 (diff)
downloadqt-creator-2766aaad4b6204c08f2a3d8144da3b7b2daa16a0.tar.gz
introduce Qt4ProFileNode::sourceDir()
complementary to buildDir() Change-Id: I8b79775fd5187887901faed667ea83fc4fbca041 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager')
-rw-r--r--src/plugins/qt4projectmanager/qt4nodes.cpp7
-rw-r--r--src/plugins/qt4projectmanager/qt4nodes.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index be2091102e..078fcb1f80 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -2455,9 +2455,14 @@ InstallsList Qt4ProFileNode::installsList() const
return m_installsList;
}
+QString Qt4ProFileNode::sourceDir() const
+{
+ return m_projectDir;
+}
+
QString Qt4ProFileNode::buildDir(Qt4BuildConfiguration *bc) const
{
- const QDir srcDirRoot = QFileInfo(m_project->rootProjectNode()->path()).absoluteDir();
+ const QDir srcDirRoot = m_project->rootQt4ProjectNode()->sourceDir();
const QString relativeDir = srcDirRoot.relativeFilePath(m_projectDir);
if (!bc && m_project->activeTarget())
bc = qobject_cast<Qt4BuildConfiguration *>(m_project->activeTarget()->activeBuildConfiguration());
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index cdc7a8d926..6fe8a1a65f 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -368,6 +368,7 @@ public:
void updateCodeModelSupportFromBuild(const QStringList &files);
void updateCodeModelSupportFromEditor(const QString &uiFileName, const QString &contents);
+ QString sourceDir() const;
QString buildDir(Qt4BuildConfiguration *bc = 0) const;
QString uiDirectory() const;