summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qt4project.h
diff options
context:
space:
mode:
authorPawel Polanski <pawel.3.polanski@nokia.com>2011-01-24 15:36:46 +0100
committerPawel Polanski <pawel.3.polanski@nokia.com>2011-01-24 15:38:38 +0100
commitd6f90004514f57436ebf5142fc5ff0d02a42e31c (patch)
tree5d9706d0b62f61229962c46f71a7066adc725a67 /src/plugins/qt4projectmanager/qt4project.h
parent4b8ad4d31f698bba2749f7a9d01092ca445727d3 (diff)
downloadqt-creator-d6f90004514f57436ebf5142fc5ff0d02a42e31c.tar.gz
Symbian: Passive content projects are deployed correctly.
Task-number: QTCREATORBUG-3579
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4project.h')
-rw-r--r--src/plugins/qt4projectmanager/qt4project.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index f75a3d97d3..e46518c690 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -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);