Commit d6f90004 authored by Pawel Polanski's avatar Pawel Polanski
Browse files

Symbian: Passive content projects are deployed correctly.

Task-number: QTCREATORBUG-3579
parent 4b8ad4d3
......@@ -181,7 +181,7 @@ bool S60CreatePackageStep::init()
{
Qt4Project *pro = qobject_cast<Qt4Project *>(buildConfiguration()->target()->project());
QList<Qt4ProFileNode *> nodes = pro->leafProFiles();
QList<Qt4ProFileNode *> nodes = pro->allProFiles();
m_workingDirectories.clear();
QStringList projectCapabilities;
......
......@@ -148,9 +148,10 @@ bool S60DeployConfiguration::isStaticLibrary(const Qt4ProFileNode &projectNode)
QStringList S60DeployConfiguration::signedPackages() const
{
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles();
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->allProFiles();
QStringList result;
foreach (Qt4ProFileNode *node, list) {
qDebug() << __FUNCTION__ << node->targetInformation().buildDir;
if (isStaticLibrary(*node)) //no sis package
continue;
TargetInformation ti = node->targetInformation();
......@@ -171,7 +172,7 @@ QString S60DeployConfiguration::createPackageName(const QString &baseName) const
QStringList S60DeployConfiguration::packageFileNamesWithTargetInfo() const
{
QList<Qt4ProFileNode *> leafs = qt4Target()->qt4Project()->leafProFiles();
QList<Qt4ProFileNode *> leafs = qt4Target()->qt4Project()->allProFiles();
QStringList result;
foreach (Qt4ProFileNode *qt4ProFileNode, leafs) {
if (isStaticLibrary(*qt4ProFileNode)) //no sis package
......@@ -190,7 +191,7 @@ QStringList S60DeployConfiguration::packageFileNamesWithTargetInfo() const
QStringList S60DeployConfiguration::packageTemplateFileNames() const
{
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles();
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->allProFiles();
QStringList result;
foreach (Qt4ProFileNode *node, list) {
if (isStaticLibrary(*node)) //no sis package
......@@ -204,7 +205,7 @@ QStringList S60DeployConfiguration::packageTemplateFileNames() const
QStringList S60DeployConfiguration::appPackageTemplateFileNames() const
{
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles();
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->allProFiles();
QStringList result;
foreach (Qt4ProFileNode *node, list) {
if (isStaticLibrary(*node)) //no sis package
......@@ -318,7 +319,7 @@ QVariantMap S60DeployConfiguration::toMap() const
QString S60DeployConfiguration::defaultDisplayName() const
{
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles();
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->allProFiles();
foreach (Qt4ProFileNode *node, list) {
TargetInformation ti = node->targetInformation();
if (ti.valid && !ti.buildDir.isEmpty())
......
......@@ -969,15 +969,13 @@ QList<BuildConfigWidget*> Qt4Project::subConfigWidgets()
return subWidgets;
}
void Qt4Project::collectLeafProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNode *node)
void Qt4Project::collectAllfProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNode *node)
{
if (node->projectType() != Internal::SubDirsTemplate) {
list.append(node);
}
list.append(node);
foreach (ProjectNode *n, node->subProjectNodes()) {
Qt4ProFileNode *qt4ProFileNode = qobject_cast<Qt4ProFileNode *>(n);
if (qt4ProFileNode)
collectLeafProFiles(list, qt4ProFileNode);
collectAllfProFiles(list, qt4ProFileNode);
}
}
......@@ -995,12 +993,12 @@ void Qt4Project::collectApplicationProFiles(QList<Qt4ProFileNode *> &list, Qt4Pr
}
}
QList<Qt4ProFileNode *> Qt4Project::leafProFiles() const
QList<Qt4ProFileNode *> Qt4Project::allProFiles() const
{
QList<Qt4ProFileNode *> list;
if (!rootProjectNode())
return list;
collectLeafProFiles(list, rootProjectNode());
collectAllfProFiles(list, rootProjectNode());
return list;
}
......
......@@ -167,7 +167,7 @@ public:
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
QList<Internal::Qt4ProFileNode *> leafProFiles() const;
QList<Internal::Qt4ProFileNode *> allProFiles() const;
QList<Internal::Qt4ProFileNode *> applicationProFiles() const;
bool hasApplicationProFile(const QString &path) const;
QStringList applicationProFilePathes(const QString &prepend = QString()) const;
......@@ -224,7 +224,7 @@ private:
void updateQmlJSCodeModel();
static void collectLeafProFiles(QList<Internal::Qt4ProFileNode *> &list, Internal::Qt4ProFileNode *node);
static void collectAllfProFiles(QList<Internal::Qt4ProFileNode *> &list, Internal::Qt4ProFileNode *node);
static void collectApplicationProFiles(QList<Internal::Qt4ProFileNode *> &list, Internal::Qt4ProFileNode *node);
static void findProFile(const QString& fileName, Internal::Qt4ProFileNode *root, QList<Internal::Qt4ProFileNode *> &list);
static bool hasSubNode(Internal::Qt4PriFileNode *root, const QString &path);
......
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