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

Symbian: Passive content projects are deployed correctly.

Browse Source 
Task-number: QTCREATORBUG-3579
This commit is contained in:
Pawel Polanski
2011-01-24 15:36:46 +01:00
parent 4b8ad4d31f
commit d6f9000451
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
View File

@@ -181,7 +181,7 @@ bool S60CreatePackageStep::init()
{ {
Qt4Project *pro = qobject_cast<Qt4Project *>(buildConfiguration()->target()->project()); Qt4Project *pro = qobject_cast<Qt4Project *>(buildConfiguration()->target()->project());
QList<Qt4ProFileNode *> nodes = pro->leafProFiles(); QList<Qt4ProFileNode *> nodes = pro->allProFiles();
m_workingDirectories.clear(); m_workingDirectories.clear();
QStringList projectCapabilities; QStringList projectCapabilities;

11
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
View File

@@ -148,9 +148,10 @@ bool S60DeployConfiguration::isStaticLibrary(const Qt4ProFileNode &projectNode)
QStringList S60DeployConfiguration::signedPackages() const QStringList S60DeployConfiguration::signedPackages() const
{ {
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles(); QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->allProFiles();
QStringList result; QStringList result;
foreach (Qt4ProFileNode *node, list) { foreach (Qt4ProFileNode *node, list) {
qDebug() << __FUNCTION__ << node->targetInformation().buildDir;
if (isStaticLibrary(*node)) //no sis package if (isStaticLibrary(*node)) //no sis package
continue; continue;
TargetInformation ti = node->targetInformation(); TargetInformation ti = node->targetInformation();
@@ -171,7 +172,7 @@ QString S60DeployConfiguration::createPackageName(const QString &baseName) const
QStringList S60DeployConfiguration::packageFileNamesWithTargetInfo() const QStringList S60DeployConfiguration::packageFileNamesWithTargetInfo() const
{ {
QList<Qt4ProFileNode *> leafs = qt4Target()->qt4Project()->leafProFiles(); QList<Qt4ProFileNode *> leafs = qt4Target()->qt4Project()->allProFiles();
QStringList result; QStringList result;
foreach (Qt4ProFileNode *qt4ProFileNode, leafs) { foreach (Qt4ProFileNode *qt4ProFileNode, leafs) {
if (isStaticLibrary(*qt4ProFileNode)) //no sis package if (isStaticLibrary(*qt4ProFileNode)) //no sis package
@@ -190,7 +191,7 @@ QStringList S60DeployConfiguration::packageFileNamesWithTargetInfo() const
QStringList S60DeployConfiguration::packageTemplateFileNames() const QStringList S60DeployConfiguration::packageTemplateFileNames() const
{ {
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles(); QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->allProFiles();
QStringList result; QStringList result;
foreach (Qt4ProFileNode *node, list) { foreach (Qt4ProFileNode *node, list) {
if (isStaticLibrary(*node)) //no sis package if (isStaticLibrary(*node)) //no sis package
@@ -204,7 +205,7 @@ QStringList S60DeployConfiguration::packageTemplateFileNames() const
QStringList S60DeployConfiguration::appPackageTemplateFileNames() const QStringList S60DeployConfiguration::appPackageTemplateFileNames() const
{ {
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles(); QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->allProFiles();
QStringList result; QStringList result;
foreach (Qt4ProFileNode *node, list) { foreach (Qt4ProFileNode *node, list) {
if (isStaticLibrary(*node)) //no sis package if (isStaticLibrary(*node)) //no sis package
@@ -318,7 +319,7 @@ QVariantMap S60DeployConfiguration::toMap() const
QString S60DeployConfiguration::defaultDisplayName() const QString S60DeployConfiguration::defaultDisplayName() const
{ {
QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->leafProFiles(); QList<Qt4ProFileNode *> list = qt4Target()->qt4Project()->allProFiles();
foreach (Qt4ProFileNode *node, list) { foreach (Qt4ProFileNode *node, list) {
TargetInformation ti = node->targetInformation(); TargetInformation ti = node->targetInformation();
if (ti.valid && !ti.buildDir.isEmpty()) if (ti.valid && !ti.buildDir.isEmpty())

10
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -969,15 +969,13 @@ QList<BuildConfigWidget*> Qt4Project::subConfigWidgets()
return subWidgets; 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()) { foreach (ProjectNode *n, node->subProjectNodes()) {
Qt4ProFileNode *qt4ProFileNode = qobject_cast<Qt4ProFileNode *>(n); Qt4ProFileNode *qt4ProFileNode = qobject_cast<Qt4ProFileNode *>(n);
if (qt4ProFileNode) 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; QList<Qt4ProFileNode *> list;
if (!rootProjectNode()) if (!rootProjectNode())
return list; return list;
collectLeafProFiles(list, rootProjectNode()); collectAllfProFiles(list, rootProjectNode());
return list; return list;
} }

4
src/plugins/qt4projectmanager/qt4project.h
View File

@@ -167,7 +167,7 @@ public:
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets(); QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
QList<Internal::Qt4ProFileNode *> leafProFiles() const; QList<Internal::Qt4ProFileNode *> allProFiles() const;
QList<Internal::Qt4ProFileNode *> applicationProFiles() const; QList<Internal::Qt4ProFileNode *> applicationProFiles() const;
bool hasApplicationProFile(const QString &path) const; bool hasApplicationProFile(const QString &path) const;
QStringList applicationProFilePathes(const QString &prepend = QString()) const; QStringList applicationProFilePathes(const QString &prepend = QString()) const;
@@ -224,7 +224,7 @@ private:
void updateQmlJSCodeModel(); 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 collectApplicationProFiles(QList<Internal::Qt4ProFileNode *> &list, Internal::Qt4ProFileNode *node);
static void findProFile(const QString& fileName, Internal::Qt4ProFileNode *root, QList<Internal::Qt4ProFileNode *> &list); static void findProFile(const QString& fileName, Internal::Qt4ProFileNode *root, QList<Internal::Qt4ProFileNode *> &list);
static bool hasSubNode(Internal::Qt4PriFileNode *root, const QString &path); static bool hasSubNode(Internal::Qt4PriFileNode *root, const QString &path);