summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-04-27 07:59:22 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-04-27 07:59:22 (GMT)
commite26f32ef8e1480f80e362059cc03c4b5a7fb92e9 (patch)
tree91633e4922fe47e86efa8e6d2993f5c8224af106 /qmake
parent04b8d70bb0965f868ffa78595c7afc99675e656e (diff)
downloadQt-e26f32ef8e1480f80e362059cc03c4b5a7fb92e9.zip
Qt-e26f32ef8e1480f80e362059cc03c4b5a7fb92e9.tar.gz
Qt-e26f32ef8e1480f80e362059cc03c4b5a7fb92e9.tar.bz2
Fixed emulator deployment for symbian-sbsv2
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/symbian/symmake_sbsv2.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 2a15ee5..541226f 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -350,16 +350,18 @@ bool SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
DeploymentList depList;
initProjectDeploySymbian( project, depList, remoteTestPath, false, QLatin1String("winscw"), QLatin1String("udeb"), generatedDirs, generatedFiles );
+ t << "#if defined(WINSCW)" << endl;
for (int i=0; i<depList.size(); ++i) {
t << "START EXTENSION qt/qmake_emulator_deployment" << endl;
QString fromItem = depList.at(i).from;
QString toItem = depList.at(i).to;
fromItem.replace("\\", "/");
- toItem.replace("\\", "/");
+ toItem.replace("\\", "/").prepend(QDir::current().absolutePath().left(2)); // add drive
t << "OPTION DEPLOY_SOURCE " << fromItem << endl;
t << "OPTION DEPLOY_TARGET " << toItem << endl;
t << "END" << endl;
}
+ t << "#endif" << endl;
t << endl;
#endif