diff options
| author | axis <qt-info@nokia.com> | 2010-03-01 14:39:10 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-01 14:39:29 (GMT) |
| commit | b45eeb23718ce0b01391c74039587b22c996854b (patch) | |
| tree | 5ae337d1597f6131288d2b2d0471933587b9a5ee /qmake | |
| parent | 88a36e9e7e0e0bc09788c41ab6b968031dbc9154 (diff) | |
| download | Qt-b45eeb23718ce0b01391c74039587b22c996854b.zip Qt-b45eeb23718ce0b01391c74039587b22c996854b.tar.gz Qt-b45eeb23718ce0b01391c74039587b22c996854b.tar.bz2 | |
Corrected a mismerge by Git.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 3d8b556..8c7eabf 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -386,7 +386,7 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t //write emulator deployment t << "#if defined(WINSCW)" << endl; - initProjectDeploySymbian(project, depList, remoteTestPath, false, + initProjectDeploySymbian(project, depList, remoteTestPath, false, true, QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM), QString(), generatedDirs, generatedFiles); writeSbsDeploymentList(depList, t); t << "#endif" << endl; |