diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-21 19:16:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-21 19:16:32 (GMT) |
| commit | ddd53623d5cf2ee151b4c8a683e91101397d7e6c (patch) | |
| tree | 5b2510188f1c19cbe88be0e553484eb2e0b37b21 /qmake | |
| parent | 917fe59fbeeb8de04ede0242905eed87855b252d (diff) | |
| parent | de1417c6648a2589f56a7df0603b26387037aa31 (diff) | |
| download | Qt-ddd53623d5cf2ee151b4c8a683e91101397d7e6c.zip Qt-ddd53623d5cf2ee151b4c8a683e91101397d7e6c.tar.gz Qt-ddd53623d5cf2ee151b4c8a683e91101397d7e6c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added support for QMAKE_CLEAN in symbian-sbsv2
Only add NetworkServices capability automatically if no caps are set.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 9eccd46..f94a63f 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -721,6 +721,18 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t t << "END" << endl; t << endl; + // Handle QMAKE_CLEAN + QStringList cleanFiles = project->values("QMAKE_CLEAN"); + if (!cleanFiles.isEmpty()) { + QStringList absoluteCleanFiles; + foreach (QString cleanFile, cleanFiles) { + QFileInfo fi(cleanFile); + absoluteCleanFiles << fi.absoluteFilePath(); + } + t << "START EXTENSION qt/qmake_clean" << endl; + t << "OPTION CLEAN_FILES " << absoluteCleanFiles.join(" ") << endl; + t << "END" << endl; + } t << endl; } |