diff options
| author | axis <qt-info@nokia.com> | 2010-02-26 09:05:39 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-26 09:05:39 (GMT) |
| commit | 5e9382c018e231c5e2ef49dd8a38eaff535b9837 (patch) | |
| tree | 89f13d31d5804c38999fdefd0e2aca39d305f91c /qmake/generators/symbian/symmake_sbsv2.h | |
| parent | 11e54877f87ff97039452f117d40ec17eefbcbff (diff) | |
| parent | 53e7dda038e9251ca7380d3717709764c580192e (diff) | |
| download | Qt-5e9382c018e231c5e2ef49dd8a38eaff535b9837.zip Qt-5e9382c018e231c5e2ef49dd8a38eaff535b9837.tar.gz Qt-5e9382c018e231c5e2ef49dd8a38eaff535b9837.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
Diffstat (limited to 'qmake/generators/symbian/symmake_sbsv2.h')
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.h b/qmake/generators/symbian/symmake_sbsv2.h index 5c31249..b8ccdbe 100644 --- a/qmake/generators/symbian/symmake_sbsv2.h +++ b/qmake/generators/symbian/symmake_sbsv2.h @@ -64,6 +64,7 @@ public: private: void exportFlm(); + void writeSbsDeploymentList(const DeploymentList& depList, QTextStream& t); QString extraTargetsCache; QString extraCompilersCache; |