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

Introduce symbian ovi publishing wizard

Browse Source
This commit is contained in:
Primrose Mbanefo
2011-01-21 15:37:05 +01:00
parent fe03946df9
commit 8d781af43b
21 changed files with 2132 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -38,7 +38,6 @@
#include "qt4projectmanager.h"
#include "qt4projectmanagerconstants.h"
#include "qtuicodemodelsupport.h"
#include "qt4buildconfiguration.h"
#include "qmakestep.h"
#include <projectexplorer/nodesvisitor.h>
@@ -2120,11 +2119,15 @@ InstallsList Qt4ProFileNode::installsList() const
return m_installsList;
}
QString Qt4ProFileNode::buildDir() const
QString Qt4ProFileNode::buildDir(Qt4BuildConfiguration *bc) const
{
const QDir srcDirRoot = QFileInfo(m_project->rootProjectNode()->path()).absoluteDir();
const QString relativeDir = srcDirRoot.relativeFilePath(m_projectDir);
return QDir(m_project->activeTarget()->activeBuildConfiguration()->buildDirectory()).absoluteFilePath(relativeDir);
if (!bc && m_project->activeTarget())
bc = m_project->activeTarget()->activeBuildConfiguration();
if (!bc)
return QString();
return QDir(bc->buildDirectory()).absoluteFilePath(relativeDir);
}
/*